From 5dc883892ec0e01cc618248b2abd3cb5d98ea342 Mon Sep 17 00:00:00 2001 From: Player Date: Wed, 4 May 2022 20:34:27 +0200 Subject: [PATCH] 22w18a --- build.gradle | 4 +- .../minecraft/advancement/Advancement.mapping | 1 - .../block/entity/BannerPattern.mapping | 23 ++------- .../block/entity/JigsawBlockEntity.mapping | 8 ++- .../minecraft/client/MinecraftClient.mapping | 14 +----- .../client/gui/hud/ChatHudListener.mapping | 4 -- .../client/gui/hud/InGameHud.mapping | 2 +- .../gui/screen/ingame/LoomScreen.mapping | 7 +-- .../AbstractClientPlayerEntity.mapping | 2 +- .../client/network/ClientPlayerEntity.mapping | 4 +- .../client/network/PlayerListEntry.mapping | 4 +- .../screen/RealmsSlotOptionsScreen.mapping | 11 ---- .../render/TexturedRenderLayers.mapping | 12 ++--- .../client/render/WorldRenderer.mapping | 1 - .../entity/model/FrogEntityModel.mapping | 6 --- .../entity/model/WardenEntityModel.mapping | 6 --- .../IdentifierSearchableContainer.mapping | 12 +---- .../minecraft/client/search/Iterator.mapping | 2 + .../client/search/SearchManager.mapping | 5 +- .../client/search/SearchableContainer.mapping | 2 - .../search/TextSearchableContainer.mapping | 4 +- .../client/util/NarratorManager.mapping | 4 -- mappings/net/minecraft/data/DataCache.mapping | 8 ++- .../net/minecraft/data/DataProvider.mapping | 7 +-- .../net/minecraft/data/DataWriter.mapping | 6 +-- .../net/minecraft/data/SnbtProvider.mapping | 15 +++--- .../client/BlockStateModelGenerator.mapping | 20 +------- .../data/client/ModelProvider.mapping | 1 - .../data/report/BlockListProvider.mapping | 1 - .../data/report/CommandSyntaxProvider.mapping | 1 - .../data/report/RegistryDumpProvider.mapping | 1 - .../data/report/WorldgenProvider.mapping | 1 - .../data/server/AbstractTagProvider.mapping | 1 - .../data/server/AdvancementProvider.mapping | 1 - .../server/BiomeParametersProvider.mapping | 1 - .../server/BlockLootTableGenerator.mapping | 6 +-- .../data/server/LootTableProvider.mapping | 1 - .../data/server/RecipeProvider.mapping | 1 - .../minecraft/entity/AnimationState.mapping | 1 - .../entity/ai/WardenAngerManager.mapping | 7 +-- .../ai/brain/task/StartSniffingTask.mapping | 2 +- .../entity/data/TrackedDataHandler.mapping | 8 +-- .../effect/StatusEffectInstance.mapping | 6 +-- .../minecraft/entity/mob/WardenEntity.mapping | 4 -- .../entity/player/PlayerEntity.mapping | 3 +- .../minecraft/item/BannerPatternItem.mapping | 7 ++- .../net/minecraft/item/GoatHornItem.mapping | 22 ++------ .../LootConditionConsumingBuilder.mapping | 4 +- .../LootFunctionConsumingBuilder.mapping | 3 +- .../function/SetBannerPatternFunction.mapping | 3 +- .../SetGoatHornSoundLootFunction.mapping | 2 +- .../net/minecraft/network/MessageType.mapping | 9 ---- .../minecraft/network/PacketByteBuf.mapping | 50 +++++-------------- .../encryption/NetworkEncryptionUtils.mapping | 21 -------- .../encryption/PlayerPublicKey.mapping | 46 +---------------- .../c2s/login/LoginKeyC2SPacket.mapping | 4 +- .../login/LoginQueryResponseC2SPacket.mapping | 2 - .../c2s/play/ChatMessageC2SPacket.mapping | 13 ----- .../s2c/play/ChatMessageS2CPacket.mapping | 4 -- .../s2c/play/MapUpdateS2CPacket.mapping | 2 - .../s2c/play/PlayerListS2CPacket.mapping | 7 +-- .../play/ResourcePackSendS2CPacket.mapping | 2 - .../SelectAdvancementTabS2CPacket.mapping | 2 - .../resource/DefaultResourcePack.mapping | 2 +- .../screen/LoomScreenHandler.mapping | 2 +- .../minecraft/server/MinecraftServer.mapping | 30 ----------- .../minecraft/server/PlayerManager.mapping | 20 ++------ .../server/command/MeCommand.mapping | 7 --- .../server/command/MessageCommand.mapping | 7 +-- .../command/ServerCommandSource.mapping | 2 +- .../server/command/TeamMsgCommand.mapping | 4 +- .../MinecraftDedicatedServer.mapping | 5 -- .../dedicated/ServerPropertiesHandler.mapping | 5 -- .../network/ServerLoginNetworkHandler.mapping | 4 +- .../network/ServerPlayNetworkHandler.mapping | 4 -- .../server/network/ServerPlayerEntity.mapping | 29 +++-------- .../listener/GameEventDispatcher.mapping | 2 +- .../event/listener/GameEventListener.mapping | 5 +- .../SimpleGameEventDispatcher.mapping | 6 +-- 79 files changed, 102 insertions(+), 476 deletions(-) create mode 100644 mappings/net/minecraft/client/search/Iterator.mapping diff --git a/build.gradle b/build.gradle index 741bc402e7..528474b31a 100644 --- a/build.gradle +++ b/build.gradle @@ -27,7 +27,7 @@ plugins { id 'net.fabricmc.filament' version '0.3.0' } -def minecraft_version = "22w17a" +def minecraft_version = "22w18a" def ENV = System.getenv() // Fetch build number from Github Actions @@ -335,6 +335,8 @@ task downloadMcLibs(dependsOn: downloadWantedVersionManifest) { } version.libraries.each { + if (it.downloads.artifact == null) return // TODO: happens for downloads.classifiers - implement properly? + def downloadUrl = it.downloads.artifact.url download { diff --git a/mappings/net/minecraft/advancement/Advancement.mapping b/mappings/net/minecraft/advancement/Advancement.mapping index 5b28f87c81..3ebacf9d8f 100644 --- a/mappings/net/minecraft/advancement/Advancement.mapping +++ b/mappings/net/minecraft/advancement/Advancement.mapping @@ -77,7 +77,6 @@ CLASS net/minecraft/class_161 net/minecraft/advancement/Advancement ARG 8 hidden METHOD method_698 toJson ()Lcom/google/gson/JsonObject; METHOD method_699 toPacket (Lnet/minecraft/class_2540;)V - ARG 1 buf METHOD method_700 findParent (Ljava/util/function/Function;)Z ARG 1 parentProvider METHOD method_701 parent (Lnet/minecraft/class_161;)Lnet/minecraft/class_161$class_162; diff --git a/mappings/net/minecraft/block/entity/BannerPattern.mapping b/mappings/net/minecraft/block/entity/BannerPattern.mapping index a5479f46e0..b063d85e6e 100644 --- a/mappings/net/minecraft/block/entity/BannerPattern.mapping +++ b/mappings/net/minecraft/block/entity/BannerPattern.mapping @@ -1,31 +1,14 @@ CLASS net/minecraft/class_2582 net/minecraft/block/entity/BannerPattern - FIELD field_11808 name Ljava/lang/String; FIELD field_11824 id Ljava/lang/String; - FIELD field_11846 COUNT I - FIELD field_18283 LOOM_APPLICABLE_COUNT I - FIELD field_24417 HAS_PATTERN_ITEM_COUNT I - FIELD field_24418 VALUES [Lnet/minecraft/class_2582; - FIELD field_24419 hasPatternItem Z - METHOD (Ljava/lang/String;ILjava/lang/String;Ljava/lang/String;)V - ARG 3 name - ARG 4 id - METHOD (Ljava/lang/String;ILjava/lang/String;Ljava/lang/String;Z)V - ARG 3 name - ARG 4 id - ARG 5 hasPatternItem METHOD method_10945 getId ()Ljava/lang/String; - METHOD method_10946 byId (Ljava/lang/String;)Lnet/minecraft/class_2582; + METHOD method_10946 byId (Ljava/lang/String;)Lnet/minecraft/class_6880; ARG 0 id - METHOD method_10947 getName ()Ljava/lang/String; - METHOD method_22536 getSpriteId (Z)Lnet/minecraft/class_2960; + METHOD method_22536 getSpriteId (Lnet/minecraft/class_5321;Z)Lnet/minecraft/class_2960; ARG 1 banner - METHOD method_31652 byName (Ljava/lang/String;)Lnet/minecraft/class_2582; - ARG 0 name CLASS class_3750 Patterns FIELD field_16548 entries Ljava/util/List; METHOD method_16375 toNbt ()Lnet/minecraft/class_2499; - METHOD method_16376 add (Lnet/minecraft/class_2582;Lnet/minecraft/class_1767;)Lnet/minecraft/class_2582$class_3750; - ARG 1 pattern + METHOD method_16376 add (Lnet/minecraft/class_6880;Lnet/minecraft/class_1767;)Lnet/minecraft/class_2582$class_3750; ARG 2 color METHOD method_31653 add (Lcom/mojang/datafixers/util/Pair;)Lnet/minecraft/class_2582$class_3750; ARG 1 pattern diff --git a/mappings/net/minecraft/block/entity/JigsawBlockEntity.mapping b/mappings/net/minecraft/block/entity/JigsawBlockEntity.mapping index 91598f4cb7..b17ba9c5dd 100644 --- a/mappings/net/minecraft/block/entity/JigsawBlockEntity.mapping +++ b/mappings/net/minecraft/block/entity/JigsawBlockEntity.mapping @@ -2,7 +2,7 @@ CLASS net/minecraft/class_3751 net/minecraft/block/entity/JigsawBlockEntity FIELD field_16550 name Lnet/minecraft/class_2960; FIELD field_16551 finalState Ljava/lang/String; FIELD field_16552 target Lnet/minecraft/class_2960; - FIELD field_23327 pool Lnet/minecraft/class_2960; + FIELD field_23327 pool Lnet/minecraft/class_5321; FIELD field_23328 joint Lnet/minecraft/class_3751$class_4991; FIELD field_31343 TARGET_KEY Ljava/lang/String; FIELD field_31344 POOL_KEY Ljava/lang/String; @@ -20,15 +20,13 @@ CLASS net/minecraft/class_3751 net/minecraft/block/entity/JigsawBlockEntity ARG 1 name METHOD method_16380 getFinalState ()Ljava/lang/String; METHOD method_16381 getName ()Lnet/minecraft/class_2960; - METHOD method_16382 getPool ()Lnet/minecraft/class_2960; + METHOD method_16382 getPool ()Lnet/minecraft/class_5321; METHOD method_26396 setJoint (Lnet/minecraft/class_3751$class_4991;)V ARG 1 joint - METHOD method_26398 setPool (Lnet/minecraft/class_2960;)V - ARG 1 pool + METHOD method_26398 setPool (Lnet/minecraft/class_5321;)V METHOD method_26399 getTarget ()Lnet/minecraft/class_2960; METHOD method_26400 getJoint ()Lnet/minecraft/class_3751$class_4991; METHOD method_27191 generate (Lnet/minecraft/class_3218;IZ)V - ARG 1 world ARG 2 maxDepth ARG 3 keepJigsaws CLASS class_4991 Joint diff --git a/mappings/net/minecraft/client/MinecraftClient.mapping b/mappings/net/minecraft/client/MinecraftClient.mapping index 6f87bed84e..b73e887ada 100644 --- a/mappings/net/minecraft/client/MinecraftClient.mapping +++ b/mappings/net/minecraft/client/MinecraftClient.mapping @@ -181,7 +181,7 @@ CLASS net/minecraft/class_310 net/minecraft/client/MinecraftClient METHOD method_1481 joinWorld (Lnet/minecraft/class_638;)V ARG 1 world METHOD method_1483 getSoundManager ()Lnet/minecraft/class_1144; - METHOD method_1484 getSearchableContainer (Lnet/minecraft/class_1124$class_1125;)Lnet/minecraft/class_1123; + METHOD method_1484 getSearchableContainer (Lnet/minecraft/class_1124$class_1125;)Lnet/minecraft/class_1129; ARG 1 key METHOD method_1485 (Lnet/minecraft/class_1799;)Ljava/util/stream/Stream; ARG 0 stack @@ -200,8 +200,6 @@ CLASS net/minecraft/class_310 net/minecraft/client/MinecraftClient METHOD method_1499 addBlockEntityNbt (Lnet/minecraft/class_1799;Lnet/minecraft/class_2586;)Lnet/minecraft/class_1799; ARG 1 stack ARG 2 blockEntity - METHOD method_1500 (Ljava/lang/String;)Z - ARG 0 string METHOD method_1502 (Lnet/minecraft/class_1799;)Ljava/util/stream/Stream; ARG 0 stack METHOD method_1504 setCameraEntity (Lnet/minecraft/class_1297;)V @@ -232,8 +230,6 @@ CLASS net/minecraft/class_310 net/minecraft/client/MinecraftClient METHOD method_1515 getGameVersion ()Ljava/lang/String; METHOD method_1516 getResourcePackProvider ()Lnet/minecraft/class_1066; METHOD method_1517 isFancyGraphicsOrBetter ()Z - METHOD method_1518 (Lnet/minecraft/class_516;)Ljava/util/stream/Stream; - ARG 0 resultCollection METHOD method_1519 cleanUpAfterCrash ()V METHOD method_1520 getResourcePackManager ()Lnet/minecraft/class_3283; METHOD method_1521 reloadResources ()Ljava/util/concurrent/CompletableFuture; @@ -245,13 +241,9 @@ CLASS net/minecraft/class_310 net/minecraft/client/MinecraftClient METHOD method_1525 (Lnet/minecraft/class_1799;)Ljava/util/stream/Stream; ARG 0 stack METHOD method_1526 getLanguageManager ()Lnet/minecraft/class_1076; - METHOD method_1529 (Lnet/minecraft/class_516;)Ljava/util/stream/Stream; - ARG 0 resultCollection METHOD method_1530 isDemo ()Z METHOD method_1531 getTextureManager ()Lnet/minecraft/class_1060; METHOD method_1534 getLastFrameDuration ()F - METHOD method_1535 (Lnet/minecraft/class_1126;Lnet/minecraft/class_1121;Lnet/minecraft/class_1799;)V - ARG 2 stack METHOD method_1536 doAttack ()Z METHOD method_1537 setConnectedToRealms (Z)V ARG 1 connectedToRealms @@ -272,8 +264,6 @@ CLASS net/minecraft/class_310 net/minecraft/client/MinecraftClient METHOD method_1555 hasReducedDebugInfo ()Z METHOD method_1556 (Lnet/minecraft/class_1860;)Lnet/minecraft/class_2960; ARG 0 recipe - METHOD method_1557 (Lnet/minecraft/class_2561;)Ljava/lang/String; - ARG 0 tooltip METHOD method_1558 getCurrentServerEntry ()Lnet/minecraft/class_642; METHOD method_1560 getCameraEntity ()Lnet/minecraft/class_1297; METHOD method_1561 getEntityRenderDispatcher ()Lnet/minecraft/class_898; @@ -472,9 +462,9 @@ CLASS net/minecraft/class_310 net/minecraft/client/MinecraftClient METHOD method_41733 forceStopRecorder ()V METHOD method_41734 getGpuUtilizationPercentage ()D METHOD method_41735 createIntegratedServerLoader ()Lnet/minecraft/class_7196; - METHOD method_43590 getProfileKeys ()Lnet/minecraft/class_7434; METHOD method_43587 setCrashReportSupplier (Lnet/minecraft/class_128;)V ARG 1 crashReport + METHOD method_43590 getProfileKeys ()Lnet/minecraft/class_7434; CLASS class_5859 ChatRestriction COMMENT Represents the restrictions on chat on a Minecraft client. COMMENT diff --git a/mappings/net/minecraft/client/gui/hud/ChatHudListener.mapping b/mappings/net/minecraft/client/gui/hud/ChatHudListener.mapping index fdbcdb4ecf..8e18d3512f 100644 --- a/mappings/net/minecraft/client/gui/hud/ChatHudListener.mapping +++ b/mappings/net/minecraft/client/gui/hud/ChatHudListener.mapping @@ -2,7 +2,3 @@ CLASS net/minecraft/class_335 net/minecraft/client/gui/hud/ChatHudListener FIELD field_2056 client Lnet/minecraft/class_310; METHOD (Lnet/minecraft/class_310;)V ARG 1 client - METHOD method_43594 format (Lnet/minecraft/class_2561;Lnet/minecraft/class_7436;)Lnet/minecraft/class_2561; - COMMENT {@return the text formatted for displaying in the chat hud} - ARG 0 message - ARG 1 sender diff --git a/mappings/net/minecraft/client/gui/hud/InGameHud.mapping b/mappings/net/minecraft/client/gui/hud/InGameHud.mapping index 90331b0bcb..956a49b855 100644 --- a/mappings/net/minecraft/client/gui/hud/InGameHud.mapping +++ b/mappings/net/minecraft/client/gui/hud/InGameHud.mapping @@ -14,7 +14,7 @@ CLASS net/minecraft/class_329 net/minecraft/client/gui/hud/InGameHud FIELD field_2019 PUMPKIN_BLUR Lnet/minecraft/class_2960; FIELD field_2020 VIGNETTE_TEXTURE Lnet/minecraft/class_2960; FIELD field_2021 chatHud Lnet/minecraft/class_338; - FIELD field_2022 listeners Ljava/util/Map; + FIELD field_2022 listeners Ljava/util/List; FIELD field_2023 titleRemainTicks I FIELD field_2024 itemRenderer Lnet/minecraft/class_918; FIELD field_2025 spectatorHud Lnet/minecraft/class_365; diff --git a/mappings/net/minecraft/client/gui/screen/ingame/LoomScreen.mapping b/mappings/net/minecraft/client/gui/screen/ingame/LoomScreen.mapping index 119ea0b43a..051abe106e 100644 --- a/mappings/net/minecraft/client/gui/screen/ingame/LoomScreen.mapping +++ b/mappings/net/minecraft/client/gui/screen/ingame/LoomScreen.mapping @@ -5,13 +5,10 @@ CLASS net/minecraft/class_494 net/minecraft/client/gui/screen/ingame/LoomScreen FIELD field_2955 banner Lnet/minecraft/class_1799; FIELD field_2958 scrollbarClicked Z FIELD field_2961 hasTooManyPatterns Z - FIELD field_2962 canApplySpecialPattern Z - FIELD field_2963 PATTERN_BUTTON_ROW_COUNT I FIELD field_2965 canApplyDyePattern Z FIELD field_2966 TEXTURE Lnet/minecraft/class_2960; FIELD field_2967 pattern Lnet/minecraft/class_1799; FIELD field_2968 scrollPosition F - FIELD field_2970 firstPatternButtonId I FIELD field_32346 PATTERN_LIST_COLUMNS I FIELD field_32347 PATTERN_LIST_ROWS I FIELD field_32348 SCROLLBAR_WIDTH I @@ -21,11 +18,9 @@ CLASS net/minecraft/class_494 net/minecraft/client/gui/screen/ingame/LoomScreen FIELD field_32352 PATTERN_LIST_OFFSET_X I FIELD field_32353 PATTERN_LIST_OFFSET_Y I METHOD (Lnet/minecraft/class_1726;Lnet/minecraft/class_1661;Lnet/minecraft/class_2561;)V - ARG 1 handler ARG 2 inventory ARG 3 title METHOD method_17576 onInventoryChanged ()V - METHOD method_22692 drawBanner (III)V - ARG 1 pattern + METHOD method_22692 drawBanner (Lnet/minecraft/class_6880;II)V ARG 2 x ARG 3 y diff --git a/mappings/net/minecraft/client/network/AbstractClientPlayerEntity.mapping b/mappings/net/minecraft/client/network/AbstractClientPlayerEntity.mapping index 970a44ab29..641eae2f6d 100644 --- a/mappings/net/minecraft/client/network/AbstractClientPlayerEntity.mapping +++ b/mappings/net/minecraft/client/network/AbstractClientPlayerEntity.mapping @@ -5,7 +5,7 @@ CLASS net/minecraft/class_742 net/minecraft/client/network/AbstractClientPlayerE FIELD field_3899 elytraYaw F FIELD field_3900 elytraPitch F FIELD field_3901 cachedScoreboardEntry Lnet/minecraft/class_640; - METHOD (Lnet/minecraft/class_638;Lcom/mojang/authlib/GameProfile;)V + METHOD (Lnet/minecraft/class_638;Lcom/mojang/authlib/GameProfile;Lnet/minecraft/class_7428;)V ARG 1 world ARG 2 profile METHOD method_3117 getSkinTexture ()Lnet/minecraft/class_2960; diff --git a/mappings/net/minecraft/client/network/ClientPlayerEntity.mapping b/mappings/net/minecraft/client/network/ClientPlayerEntity.mapping index edd2236e58..cf06b308fc 100644 --- a/mappings/net/minecraft/client/network/ClientPlayerEntity.mapping +++ b/mappings/net/minecraft/client/network/ClientPlayerEntity.mapping @@ -110,10 +110,8 @@ CLASS net/minecraft/class_746 net/minecraft/client/network/ClientPlayerEntity METHOD method_3149 isAutoJumpEnabled ()Z METHOD method_3151 getMountJumpStrength ()F METHOD method_33689 init ()V - METHOD method_43609 signChatMessage (Ljava/time/Instant;Ljava/lang/String;)Lnet/minecraft/class_3515$class_7425; + METHOD method_43609 signChatMessage (Lnet/minecraft/class_7470;Lnet/minecraft/class_2561;)Lnet/minecraft/class_7469; COMMENT Signs the chat message. If the chat message cannot be signed, this will return COMMENT {@link NetworkEncryptionUtils.SignatureData#NONE}. - ARG 1 time - ARG 2 message METHOD method_7290 dropSelectedItem (Z)Z ARG 1 entireStack diff --git a/mappings/net/minecraft/client/network/PlayerListEntry.mapping b/mappings/net/minecraft/client/network/PlayerListEntry.mapping index ccdc786954..93e5b60676 100644 --- a/mappings/net/minecraft/client/network/PlayerListEntry.mapping +++ b/mappings/net/minecraft/client/network/PlayerListEntry.mapping @@ -12,7 +12,7 @@ CLASS net/minecraft/class_640 net/minecraft/client/network/PlayerListEntry FIELD field_3746 showTime J FIELD field_3747 blinkingHeartTime J FIELD field_39072 LOGGER Lorg/slf4j/Logger; - FIELD field_39073 publicKeyData Lnet/minecraft/class_7428$class_7429; + FIELD field_39073 publicKeyData Lnet/minecraft/class_7428; METHOD (Lnet/minecraft/class_2703$class_2705;Lcom/mojang/authlib/minecraft/MinecraftSessionService;)V ARG 1 playerListPacketEntry ARG 2 sessionService @@ -56,4 +56,4 @@ CLASS net/minecraft/class_640 net/minecraft/client/network/PlayerListEntry ARG 1 lastHealthTime METHOD method_2979 getCapeTexture ()Lnet/minecraft/class_2960; METHOD method_35757 hasCape ()Z - METHOD method_43598 getPublicKeyData ()Lnet/minecraft/class_7428$class_7429; + METHOD method_43598 getPublicKeyData ()Lnet/minecraft/class_7428; diff --git a/mappings/net/minecraft/client/realms/gui/screen/RealmsSlotOptionsScreen.mapping b/mappings/net/minecraft/client/realms/gui/screen/RealmsSlotOptionsScreen.mapping index 051af19a11..1361a097e1 100644 --- a/mappings/net/minecraft/client/realms/gui/screen/RealmsSlotOptionsScreen.mapping +++ b/mappings/net/minecraft/client/realms/gui/screen/RealmsSlotOptionsScreen.mapping @@ -5,7 +5,6 @@ CLASS net/minecraft/class_4423 net/minecraft/client/realms/gui/screen/RealmsSlot FIELD field_20116 column2_x I FIELD field_20117 options Lnet/minecraft/class_4883; FIELD field_20118 worldType Lnet/minecraft/class_4877$class_4321; - FIELD field_20119 activeSlot I FIELD field_20120 spawnProtection I FIELD field_20121 gameMode Lnet/minecraft/class_1934; FIELD field_20122 pvp Z @@ -25,7 +24,6 @@ CLASS net/minecraft/class_4423 net/minecraft/client/realms/gui/screen/RealmsSlot ARG 2 options ARG 3 worldType ARG 4 activeSlot - METHOD method_21484 getSlotName ()Ljava/lang/String; METHOD method_21486 saveSettings ()V METHOD method_25255 (Lnet/minecraft/class_4185;)V ARG 1 button @@ -51,15 +49,6 @@ CLASS net/minecraft/class_4423 net/minecraft/client/realms/gui/screen/RealmsSlot METHOD method_32500 (Lnet/minecraft/class_5676;Ljava/lang/Boolean;)V ARG 1 button ARG 2 forceGameMode - METHOD method_32502 (Lnet/minecraft/class_5676;Ljava/lang/Boolean;)V - ARG 1 button - ARG 2 spawnNpcs - METHOD method_32503 (Lnet/minecraft/class_5676;Ljava/lang/Boolean;)V - ARG 1 button - ARG 2 spawnMonsters - METHOD method_32504 (Lnet/minecraft/class_5676;Ljava/lang/Boolean;)V - ARG 1 button - ARG 2 spawnAnimals METHOD method_32505 (Lnet/minecraft/class_5676;Ljava/lang/Boolean;)V ARG 1 button ARG 2 pvp diff --git a/mappings/net/minecraft/client/render/TexturedRenderLayers.mapping b/mappings/net/minecraft/client/render/TexturedRenderLayers.mapping index 0259632efc..bae46ace95 100644 --- a/mappings/net/minecraft/client/render/TexturedRenderLayers.mapping +++ b/mappings/net/minecraft/client/render/TexturedRenderLayers.mapping @@ -46,13 +46,9 @@ CLASS net/minecraft/class_4722 net/minecraft/client/render/TexturedRenderLayers METHOD method_24074 getEntityCutout ()Lnet/minecraft/class_1921; METHOD method_24076 getEntityTranslucentCull ()Lnet/minecraft/class_1921; METHOD method_29382 getItemEntityTranslucentCull ()Lnet/minecraft/class_1921; - METHOD method_33081 getBannerPatternTextureId (Lnet/minecraft/class_2582;)Lnet/minecraft/class_4730; - ARG 0 pattern + METHOD method_33081 getBannerPatternTextureId (Lnet/minecraft/class_5321;)Lnet/minecraft/class_4730; METHOD method_33082 getSignTextureId (Lnet/minecraft/class_4719;)Lnet/minecraft/class_4730; ARG 0 signType - METHOD method_33083 getShieldPatternTextureId (Lnet/minecraft/class_2582;)Lnet/minecraft/class_4730; - ARG 0 pattern - METHOD method_33084 createBannerPatternTextureId (Lnet/minecraft/class_2582;)Lnet/minecraft/class_4730; - ARG 0 pattern - METHOD method_33085 createShieldPatternTextureId (Lnet/minecraft/class_2582;)Lnet/minecraft/class_4730; - ARG 0 pattern + METHOD method_33083 getShieldPatternTextureId (Lnet/minecraft/class_5321;)Lnet/minecraft/class_4730; + METHOD method_33084 createBannerPatternTextureId (Lnet/minecraft/class_5321;)Lnet/minecraft/class_4730; + METHOD method_33085 createShieldPatternTextureId (Lnet/minecraft/class_5321;)Lnet/minecraft/class_4730; diff --git a/mappings/net/minecraft/client/render/WorldRenderer.mapping b/mappings/net/minecraft/client/render/WorldRenderer.mapping index 818b57368d..76efc1a3a3 100644 --- a/mappings/net/minecraft/client/render/WorldRenderer.mapping +++ b/mappings/net/minecraft/client/render/WorldRenderer.mapping @@ -253,7 +253,6 @@ CLASS net/minecraft/class_761 net/minecraft/client/render/WorldRenderer ARG 1 matrices ARG 2 projectionMatrix ARG 3 tickDelta - ARG 4 camera METHOD method_3258 drawBox (Lnet/minecraft/class_287;DDDDDDFFFF)V ARG 0 buffer ARG 1 x1 diff --git a/mappings/net/minecraft/client/render/entity/model/FrogEntityModel.mapping b/mappings/net/minecraft/client/render/entity/model/FrogEntityModel.mapping index 360de4d808..60d2d85db1 100644 --- a/mappings/net/minecraft/client/render/entity/model/FrogEntityModel.mapping +++ b/mappings/net/minecraft/client/render/entity/model/FrogEntityModel.mapping @@ -12,9 +12,3 @@ CLASS net/minecraft/class_7198 net/minecraft/client/render/entity/model/FrogEnti METHOD (Lnet/minecraft/class_630;)V ARG 1 root METHOD method_41905 getTexturedModelData ()Lnet/minecraft/class_5607; - METHOD method_41906 runAnimation (Lnet/minecraft/class_7094;Lnet/minecraft/class_7184;J)V - ARG 1 animationState - ARG 2 animation - ARG 3 time - METHOD method_41908 (Lnet/minecraft/class_7184;JLnet/minecraft/class_7094;)V - ARG 4 state diff --git a/mappings/net/minecraft/client/render/entity/model/WardenEntityModel.mapping b/mappings/net/minecraft/client/render/entity/model/WardenEntityModel.mapping index afaaa6d6e8..0459f53cb7 100644 --- a/mappings/net/minecraft/client/render/entity/model/WardenEntityModel.mapping +++ b/mappings/net/minecraft/client/render/entity/model/WardenEntityModel.mapping @@ -18,12 +18,6 @@ CLASS net/minecraft/class_7280 net/minecraft/client/render/entity/model/WardenEn METHOD (Lnet/minecraft/class_630;)V ARG 1 root METHOD method_42578 getTexturedModelData ()Lnet/minecraft/class_5607; - METHOD method_42579 runAnimation (Lnet/minecraft/class_7094;Lnet/minecraft/class_7184;J)V - ARG 1 animationState - ARG 2 animation - ARG 3 time - METHOD method_42581 (Lnet/minecraft/class_7184;JLnet/minecraft/class_7094;)V - ARG 4 state METHOD method_42734 setHeadAndBodyAngles (F)V ARG 1 animationProgress METHOD method_42735 setHeadAngle (FF)V diff --git a/mappings/net/minecraft/client/search/IdentifierSearchableContainer.mapping b/mappings/net/minecraft/client/search/IdentifierSearchableContainer.mapping index 78731e1e56..b02f7cc205 100644 --- a/mappings/net/minecraft/client/search/IdentifierSearchableContainer.mapping +++ b/mappings/net/minecraft/client/search/IdentifierSearchableContainer.mapping @@ -1,13 +1,3 @@ CLASS net/minecraft/class_1121 net/minecraft/client/search/IdentifierSearchableContainer - FIELD field_5485 byPath Lnet/minecraft/class_1128; - FIELD field_5486 entries Ljava/util/List; - FIELD field_5487 identifierFinder Ljava/util/function/Function; - FIELD field_5488 entryIds Lit/unimi/dsi/fastutil/objects/Object2IntMap; - FIELD field_5489 byNamespace Lnet/minecraft/class_1128; - METHOD (Ljava/util/function/Function;)V + METHOD (Ljava/util/function/Function;Ljava/util/List;)V ARG 1 identifierFinder - METHOD method_4795 index (Ljava/lang/Object;)V - METHOD method_4796 compare (Ljava/lang/Object;Ljava/lang/Object;)I - ARG 1 object1 - ARG 2 object2 - CLASS class_1122 Iterator diff --git a/mappings/net/minecraft/client/search/Iterator.mapping b/mappings/net/minecraft/client/search/Iterator.mapping new file mode 100644 index 0000000000..5e59d40759 --- /dev/null +++ b/mappings/net/minecraft/client/search/Iterator.mapping @@ -0,0 +1,2 @@ +CLASS net/minecraft/class_1122 net/minecraft/client/search/Iterator +CLASS net/minecraft/class_1127 net/minecraft/client/search/Iterator diff --git a/mappings/net/minecraft/client/search/SearchManager.mapping b/mappings/net/minecraft/client/search/SearchManager.mapping index a3ae687d81..be11945f63 100644 --- a/mappings/net/minecraft/client/search/SearchManager.mapping +++ b/mappings/net/minecraft/client/search/SearchManager.mapping @@ -3,9 +3,8 @@ CLASS net/minecraft/class_1124 net/minecraft/client/search/SearchManager 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_4800 get (Lnet/minecraft/class_1124$class_1125;)Lnet/minecraft/class_1123; + METHOD method_4800 get (Lnet/minecraft/class_1124$class_1125;)Lnet/minecraft/class_1129; ARG 1 key - METHOD method_4801 put (Lnet/minecraft/class_1124$class_1125;Lnet/minecraft/class_1123;)V + METHOD method_4801 put (Lnet/minecraft/class_1124$class_1125;Lnet/minecraft/class_1124$class_7456;)V ARG 1 key - ARG 2 value CLASS class_1125 Key diff --git a/mappings/net/minecraft/client/search/SearchableContainer.mapping b/mappings/net/minecraft/client/search/SearchableContainer.mapping index 99f08977fe..4822456867 100644 --- a/mappings/net/minecraft/client/search/SearchableContainer.mapping +++ b/mappings/net/minecraft/client/search/SearchableContainer.mapping @@ -1,4 +1,2 @@ CLASS net/minecraft/class_1123 net/minecraft/client/search/SearchableContainer - METHOD method_4797 clear ()V - METHOD method_4798 add (Ljava/lang/Object;)V METHOD method_4799 reload ()V diff --git a/mappings/net/minecraft/client/search/TextSearchableContainer.mapping b/mappings/net/minecraft/client/search/TextSearchableContainer.mapping index 107a252c0e..ee0dcb8def 100644 --- a/mappings/net/minecraft/client/search/TextSearchableContainer.mapping +++ b/mappings/net/minecraft/client/search/TextSearchableContainer.mapping @@ -1,7 +1,5 @@ CLASS net/minecraft/class_1126 net/minecraft/client/search/TextSearchableContainer FIELD field_5497 textFinder Ljava/util/function/Function; - FIELD field_5498 byText Lnet/minecraft/class_1128; - METHOD (Ljava/util/function/Function;Ljava/util/function/Function;)V + METHOD (Ljava/util/function/Function;Ljava/util/function/Function;Ljava/util/List;)V ARG 1 textFinder ARG 2 identifierFinder - CLASS class_1127 Iterator diff --git a/mappings/net/minecraft/client/util/NarratorManager.mapping b/mappings/net/minecraft/client/util/NarratorManager.mapping index 916df4c363..530ab435a4 100644 --- a/mappings/net/minecraft/client/util/NarratorManager.mapping +++ b/mappings/net/minecraft/client/util/NarratorManager.mapping @@ -15,7 +15,3 @@ CLASS net/minecraft/class_333 net/minecraft/client/util/NarratorManager ARG 1 text METHOD method_37016 debugPrintMessage (Ljava/lang/String;)V ARG 1 message - METHOD method_43593 toNarratedMessage (Lnet/minecraft/class_2556;Lnet/minecraft/class_2561;Lnet/minecraft/class_7436;)Lnet/minecraft/class_2561; - ARG 1 type - ARG 2 message - ARG 3 sender diff --git a/mappings/net/minecraft/data/DataCache.mapping b/mappings/net/minecraft/data/DataCache.mapping index a936feede0..1d72889ef9 100644 --- a/mappings/net/minecraft/data/DataCache.mapping +++ b/mappings/net/minecraft/data/DataCache.mapping @@ -38,18 +38,16 @@ CLASS net/minecraft/class_2408 net/minecraft/data/DataCache METHOD (Ljava/lang/String;Lnet/minecraft/class_2408$class_7405;)V ARG 1 versionName ARG 2 cachedData - METHOD method_43355 isCacheInvalid (Ljava/nio/file/Path;Ljava/lang/String;)Z + METHOD method_43355 isCacheInvalid (Ljava/nio/file/Path;Lcom/google/common/hash/HashCode;)Z ARG 1 path - ARG 2 hash CLASS class_7405 CachedData METHOD (Ljava/lang/String;)V ARG 1 version METHOD method_43356 size ()I - METHOD method_43357 get (Ljava/nio/file/Path;)Ljava/lang/String; + METHOD method_43357 get (Ljava/nio/file/Path;)Lcom/google/common/hash/HashCode; ARG 1 path - METHOD method_43358 put (Ljava/nio/file/Path;Ljava/lang/String;)V + METHOD method_43358 put (Ljava/nio/file/Path;Lcom/google/common/hash/HashCode;)V ARG 1 path - ARG 2 value METHOD method_43359 parseCache (Ljava/nio/file/Path;Ljava/nio/file/Path;)Lnet/minecraft/class_2408$class_7405; ARG 0 root ARG 1 dataProviderPath diff --git a/mappings/net/minecraft/data/DataProvider.mapping b/mappings/net/minecraft/data/DataProvider.mapping index 38a4a2fa0f..a64331e805 100644 --- a/mappings/net/minecraft/data/DataProvider.mapping +++ b/mappings/net/minecraft/data/DataProvider.mapping @@ -1,10 +1,5 @@ CLASS net/minecraft/class_2405 net/minecraft/data/DataProvider - FIELD field_11280 SHA1 Lcom/google/common/hash/HashFunction; METHOD method_10319 run (Lnet/minecraft/class_7403;)V ARG 1 cache - METHOD method_10320 writeToPath (Lcom/google/gson/Gson;Lnet/minecraft/class_7403;Lcom/google/gson/JsonElement;Ljava/nio/file/Path;)V - ARG 0 gson - ARG 1 writer - ARG 2 output - ARG 3 path + METHOD method_10320 writeToPath (Lnet/minecraft/class_7403;Lcom/google/gson/JsonElement;Ljava/nio/file/Path;)V METHOD method_10321 getName ()Ljava/lang/String; diff --git a/mappings/net/minecraft/data/DataWriter.mapping b/mappings/net/minecraft/data/DataWriter.mapping index f01eaf8a5f..b27563a9a8 100644 --- a/mappings/net/minecraft/data/DataWriter.mapping +++ b/mappings/net/minecraft/data/DataWriter.mapping @@ -1,8 +1,4 @@ CLASS net/minecraft/class_7403 net/minecraft/data/DataWriter - METHOD method_43345 write (Ljava/nio/file/Path;Ljava/lang/String;)V + METHOD method_43346 write (Ljava/nio/file/Path;[BLcom/google/common/hash/HashCode;)V ARG 1 path ARG 2 data - METHOD method_43346 write (Ljava/nio/file/Path;[BLjava/lang/String;)V - ARG 1 path - ARG 2 data - ARG 3 hash diff --git a/mappings/net/minecraft/data/SnbtProvider.mapping b/mappings/net/minecraft/data/SnbtProvider.mapping index 6bb0fc0c5a..0c6613770d 100644 --- a/mappings/net/minecraft/data/SnbtProvider.mapping +++ b/mappings/net/minecraft/data/SnbtProvider.mapping @@ -25,15 +25,18 @@ CLASS net/minecraft/class_2463 net/minecraft/data/SnbtProvider ARG 1 name ARG 2 nbt CLASS class_4511 CompressedData - FIELD field_20538 name Ljava/lang/String; - FIELD field_20539 bytes [B - FIELD field_20540 sha1 Ljava/lang/String; - FIELD field_24616 snbtContent Ljava/lang/String; - METHOD (Ljava/lang/String;[BLjava/lang/String;Ljava/lang/String;)V + 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 ARG 1 name ARG 2 bytes ARG 3 snbtContent - ARG 4 sha1 + 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 ARG 1 path diff --git a/mappings/net/minecraft/data/client/BlockStateModelGenerator.mapping b/mappings/net/minecraft/data/client/BlockStateModelGenerator.mapping index 62fa95c477..ecce33fc9f 100644 --- a/mappings/net/minecraft/data/client/BlockStateModelGenerator.mapping +++ b/mappings/net/minecraft/data/client/BlockStateModelGenerator.mapping @@ -2,7 +2,7 @@ CLASS net/minecraft/class_4910 net/minecraft/data/client/BlockStateModelGenerato FIELD field_22830 blockStateCollector Ljava/util/function/Consumer; FIELD field_22831 modelCollector Ljava/util/function/BiConsumer; FIELD field_22832 simpleItemModelExemptionCollector Ljava/util/function/Consumer; - FIELD field_28548 CONNECTION_VARIANT_FUNCTIONS Ljava/util/Map; + FIELD field_28548 CONNECTION_VARIANT_FUNCTIONS Ljava/util/List; COMMENT A map from a boolean property about connection on one direction to a COMMENT function that creates a block state variant for connection on that COMMENT direction with a given connection model. @@ -374,8 +374,6 @@ CLASS net/minecraft/class_4910 net/minecraft/data/client/BlockStateModelGenerato ARG 2 thickness METHOD method_33128 registerSculkSensor ()V METHOD method_33504 registerPetrifiedOakSlab ()V - METHOD method_33510 (Lnet/minecraft/class_2960;)Lnet/minecraft/class_4935; - ARG 0 id METHOD method_33520 registerWallPlant (Lnet/minecraft/class_2248;)V ARG 1 block METHOD method_33710 registerCaveVines ()V @@ -385,7 +383,7 @@ CLASS net/minecraft/class_4910 net/minecraft/data/client/BlockStateModelGenerato ARG 1 block METHOD method_34603 (Lnet/minecraft/class_1826;)V ARG 1 item - METHOD method_34605 (Lnet/minecraft/class_2248;Lnet/minecraft/class_4918$class_4921;Lnet/minecraft/class_2746;Ljava/util/function/Function;)V + METHOD method_34605 (Lnet/minecraft/class_2248;Lnet/minecraft/class_4918$class_4921;Lnet/minecraft/class_2746;)V ARG 2 property METHOD method_34608 createStoneState (Lnet/minecraft/class_2248;Lnet/minecraft/class_2960;Lnet/minecraft/class_4944;Ljava/util/function/BiConsumer;)Lnet/minecraft/class_4917; ARG 0 block @@ -402,8 +400,6 @@ CLASS net/minecraft/class_4910 net/minecraft/data/client/BlockStateModelGenerato ARG 0 tick ARG 1 locked ARG 2 on - METHOD method_34622 (Ljava/util/HashMap;)V - ARG 0 map METHOD method_34623 (Lnet/minecraft/class_4944;)V ARG 0 textures METHOD method_34624 (Lnet/minecraft/class_4944;Lnet/minecraft/class_2960;)Lnet/minecraft/class_4944; @@ -423,20 +419,10 @@ CLASS net/minecraft/class_4910 net/minecraft/data/client/BlockStateModelGenerato ARG 0 textures METHOD method_34637 (Lnet/minecraft/class_4944;Lnet/minecraft/class_2960;)Lnet/minecraft/class_4944; ARG 1 id - METHOD method_34638 (Lnet/minecraft/class_2960;)Lnet/minecraft/class_4935; - ARG 0 id METHOD method_34639 (Lnet/minecraft/class_2960;Lnet/minecraft/class_4944;)V ARG 1 textures - METHOD method_34644 (Lnet/minecraft/class_2960;)Lnet/minecraft/class_4935; - ARG 0 id METHOD method_34645 (Lnet/minecraft/class_2960;Lnet/minecraft/class_4944;)V ARG 1 textures - METHOD method_34649 (Lnet/minecraft/class_2960;)Lnet/minecraft/class_4935; - ARG 0 id - METHOD method_34652 (Lnet/minecraft/class_2960;)Lnet/minecraft/class_4935; - ARG 0 id - METHOD method_34654 (Lnet/minecraft/class_2960;)Lnet/minecraft/class_4935; - ARG 0 id METHOD method_34657 (Lnet/minecraft/class_2960;)Lnet/minecraft/class_4935; ARG 0 modelId METHOD method_34852 registerLightningRod ()V @@ -447,8 +433,6 @@ CLASS net/minecraft/class_4910 net/minecraft/data/client/BlockStateModelGenerato METHOD method_36440 registerInfestedDeepslate ()V METHOD method_37317 registerPottedAzaleaBush (Lnet/minecraft/class_2248;)V ARG 1 block - METHOD method_37367 (Lnet/minecraft/class_2248;Lnet/minecraft/class_4922;Lnet/minecraft/class_2960;Lnet/minecraft/class_4918$class_4921;Lnet/minecraft/class_2746;Ljava/util/function/Function;)V - ARG 4 property METHOD method_39204 registerLightBlock ()V METHOD method_42033 registerMuddyMangroveRoots ()V METHOD method_42034 registerMangrovePropagule ()V diff --git a/mappings/net/minecraft/data/client/ModelProvider.mapping b/mappings/net/minecraft/data/client/ModelProvider.mapping index 8fd0e1ee9b..1142fb2d28 100644 --- a/mappings/net/minecraft/data/client/ModelProvider.mapping +++ b/mappings/net/minecraft/data/client/ModelProvider.mapping @@ -1,6 +1,5 @@ CLASS net/minecraft/class_4916 net/minecraft/data/client/ModelProvider FIELD field_22845 LOGGER Lorg/slf4j/Logger; - FIELD field_22846 GSON Lcom/google/gson/Gson; FIELD field_22847 generator Lnet/minecraft/class_2403; METHOD (Lnet/minecraft/class_2403;)V ARG 1 generator diff --git a/mappings/net/minecraft/data/report/BlockListProvider.mapping b/mappings/net/minecraft/data/report/BlockListProvider.mapping index 57358fb9b8..2ebe435cdf 100644 --- a/mappings/net/minecraft/data/report/BlockListProvider.mapping +++ b/mappings/net/minecraft/data/report/BlockListProvider.mapping @@ -1,5 +1,4 @@ CLASS net/minecraft/class_2422 net/minecraft/data/report/BlockListProvider FIELD field_11307 generator Lnet/minecraft/class_2403; - FIELD field_17168 GSON Lcom/google/gson/Gson; METHOD (Lnet/minecraft/class_2403;)V ARG 1 generator diff --git a/mappings/net/minecraft/data/report/CommandSyntaxProvider.mapping b/mappings/net/minecraft/data/report/CommandSyntaxProvider.mapping index bd3ab6e3e6..c09ccaeff0 100644 --- a/mappings/net/minecraft/data/report/CommandSyntaxProvider.mapping +++ b/mappings/net/minecraft/data/report/CommandSyntaxProvider.mapping @@ -1,5 +1,4 @@ CLASS net/minecraft/class_2425 net/minecraft/data/report/CommandSyntaxProvider FIELD field_11321 generator Lnet/minecraft/class_2403; - FIELD field_17169 GSON Lcom/google/gson/Gson; METHOD (Lnet/minecraft/class_2403;)V ARG 1 generator diff --git a/mappings/net/minecraft/data/report/RegistryDumpProvider.mapping b/mappings/net/minecraft/data/report/RegistryDumpProvider.mapping index 54921bfb8c..0d9092361a 100644 --- a/mappings/net/minecraft/data/report/RegistryDumpProvider.mapping +++ b/mappings/net/minecraft/data/report/RegistryDumpProvider.mapping @@ -1,6 +1,5 @@ CLASS net/minecraft/class_2427 net/minecraft/data/report/RegistryDumpProvider FIELD field_11323 generator Lnet/minecraft/class_2403; - FIELD field_17170 GSON Lcom/google/gson/Gson; METHOD (Lnet/minecraft/class_2403;)V ARG 1 generator METHOD method_17174 (Lcom/google/gson/JsonObject;Lnet/minecraft/class_6880$class_6883;)V diff --git a/mappings/net/minecraft/data/report/WorldgenProvider.mapping b/mappings/net/minecraft/data/report/WorldgenProvider.mapping index 43a2bfc5ba..fda069667f 100644 --- a/mappings/net/minecraft/data/report/WorldgenProvider.mapping +++ b/mappings/net/minecraft/data/report/WorldgenProvider.mapping @@ -1,6 +1,5 @@ CLASS net/minecraft/class_5475 net/minecraft/data/report/WorldgenProvider FIELD field_26377 LOGGER Lorg/slf4j/Logger; - FIELD field_26378 GSON Lcom/google/gson/Gson; FIELD field_26379 generator Lnet/minecraft/class_2403; METHOD (Lnet/minecraft/class_2403;)V ARG 1 generator diff --git a/mappings/net/minecraft/data/server/AbstractTagProvider.mapping b/mappings/net/minecraft/data/server/AbstractTagProvider.mapping index d11110f745..b5e5924182 100644 --- a/mappings/net/minecraft/data/server/AbstractTagProvider.mapping +++ b/mappings/net/minecraft/data/server/AbstractTagProvider.mapping @@ -1,6 +1,5 @@ CLASS net/minecraft/class_2474 net/minecraft/data/server/AbstractTagProvider FIELD field_11479 LOGGER Lorg/slf4j/Logger; - FIELD field_11480 GSON Lcom/google/gson/Gson; FIELD field_11481 tagBuilders Ljava/util/Map; FIELD field_11482 registry Lnet/minecraft/class_2378; FIELD field_11483 root Lnet/minecraft/class_2403; diff --git a/mappings/net/minecraft/data/server/AdvancementProvider.mapping b/mappings/net/minecraft/data/server/AdvancementProvider.mapping index ac12055d5b..26ed462d62 100644 --- a/mappings/net/minecraft/data/server/AdvancementProvider.mapping +++ b/mappings/net/minecraft/data/server/AdvancementProvider.mapping @@ -2,7 +2,6 @@ CLASS net/minecraft/class_2409 net/minecraft/data/server/AdvancementProvider FIELD field_11288 root Lnet/minecraft/class_2403; FIELD field_11289 tabGenerators Ljava/util/List; FIELD field_11290 LOGGER Lorg/slf4j/Logger; - FIELD field_11291 GSON Lcom/google/gson/Gson; METHOD (Lnet/minecraft/class_2403;)V ARG 1 root METHOD method_10333 (Ljava/util/Set;Ljava/nio/file/Path;Lnet/minecraft/class_7403;Lnet/minecraft/class_161;)V diff --git a/mappings/net/minecraft/data/server/BiomeParametersProvider.mapping b/mappings/net/minecraft/data/server/BiomeParametersProvider.mapping index d4be210e59..d0a9b10d8a 100644 --- a/mappings/net/minecraft/data/server/BiomeParametersProvider.mapping +++ b/mappings/net/minecraft/data/server/BiomeParametersProvider.mapping @@ -1,6 +1,5 @@ CLASS net/minecraft/class_7228 net/minecraft/data/server/BiomeParametersProvider FIELD field_38012 LOGGER Lorg/slf4j/Logger; - FIELD field_38013 GSON Lcom/google/gson/Gson; FIELD field_38014 dataGenerator Lnet/minecraft/class_2403; METHOD (Lnet/minecraft/class_2403;)V ARG 1 dataGenerator diff --git a/mappings/net/minecraft/data/server/BlockLootTableGenerator.mapping b/mappings/net/minecraft/data/server/BlockLootTableGenerator.mapping index 5160bd219d..bb4e835619 100644 --- a/mappings/net/minecraft/data/server/BlockLootTableGenerator.mapping +++ b/mappings/net/minecraft/data/server/BlockLootTableGenerator.mapping @@ -67,10 +67,10 @@ CLASS net/minecraft/class_2430 net/minecraft/data/server/BlockLootTableGenerator ARG 1 product ARG 2 seeds ARG 3 condition - METHOD method_10392 addSurvivesExplosionCondition (Lnet/minecraft/class_1935;Lnet/minecraft/class_192;)Ljava/lang/Object; + METHOD method_10392 addSurvivesExplosionCondition (Lnet/minecraft/class_1935;Lnet/minecraft/class_192;)Lnet/minecraft/class_192; ARG 0 drop ARG 1 builder - METHOD method_10393 applyExplosionDecay (Lnet/minecraft/class_1935;Lnet/minecraft/class_116;)Ljava/lang/Object; + METHOD method_10393 applyExplosionDecay (Lnet/minecraft/class_1935;Lnet/minecraft/class_116;)Lnet/minecraft/class_116; ARG 0 drop ARG 1 builder METHOD method_10394 drops (Lnet/minecraft/class_1935;)Lnet/minecraft/class_52$class_53; @@ -298,7 +298,7 @@ CLASS net/minecraft/class_2430 net/minecraft/data/server/BlockLootTableGenerator ARG 0 block METHOD method_36545 copperOreDrops (Lnet/minecraft/class_2248;)Lnet/minecraft/class_52$class_53; ARG 0 ore - METHOD method_37108 glowLichenDrops (Lnet/minecraft/class_2248;)Lnet/minecraft/class_52$class_53; + METHOD method_37108 glowLichenDrops (Lnet/minecraft/class_2248;Lnet/minecraft/class_5341$class_210;)Lnet/minecraft/class_52$class_53; ARG 0 glowLichen METHOD method_42752 mangroveLeavesDrop (Lnet/minecraft/class_2248;)Lnet/minecraft/class_52$class_53; ARG 0 leaves diff --git a/mappings/net/minecraft/data/server/LootTableProvider.mapping b/mappings/net/minecraft/data/server/LootTableProvider.mapping index 498feecc16..f79d735135 100644 --- a/mappings/net/minecraft/data/server/LootTableProvider.mapping +++ b/mappings/net/minecraft/data/server/LootTableProvider.mapping @@ -2,7 +2,6 @@ CLASS net/minecraft/class_2438 net/minecraft/data/server/LootTableProvider FIELD field_11353 root Lnet/minecraft/class_2403; FIELD field_11354 lootTypeGenerators Ljava/util/List; FIELD field_11355 LOGGER Lorg/slf4j/Logger; - FIELD field_11356 GSON Lcom/google/gson/Gson; METHOD (Lnet/minecraft/class_2403;)V ARG 1 root METHOD method_10407 (Ljava/lang/String;Ljava/lang/String;)V diff --git a/mappings/net/minecraft/data/server/RecipeProvider.mapping b/mappings/net/minecraft/data/server/RecipeProvider.mapping index 3e34b10c33..26950798a6 100644 --- a/mappings/net/minecraft/data/server/RecipeProvider.mapping +++ b/mappings/net/minecraft/data/server/RecipeProvider.mapping @@ -1,7 +1,6 @@ CLASS net/minecraft/class_2446 net/minecraft/data/server/RecipeProvider FIELD field_11373 root Lnet/minecraft/class_2403; FIELD field_11374 LOGGER Lorg/slf4j/Logger; - FIELD field_11375 GSON Lcom/google/gson/Gson; FIELD field_28555 VARIANT_FACTORIES Ljava/util/Map; FIELD field_33420 COAL_ORES Lcom/google/common/collect/ImmutableList; FIELD field_33421 IRON_ORES Lcom/google/common/collect/ImmutableList; diff --git a/mappings/net/minecraft/entity/AnimationState.mapping b/mappings/net/minecraft/entity/AnimationState.mapping index cc48bef689..8e9c84d87f 100644 --- a/mappings/net/minecraft/entity/AnimationState.mapping +++ b/mappings/net/minecraft/entity/AnimationState.mapping @@ -5,5 +5,4 @@ CLASS net/minecraft/class_7094 net/minecraft/entity/AnimationState ARG 1 consumer METHOD method_41324 startIfNotRunning ()V METHOD method_41325 stop ()V - METHOD method_41326 getStartTime ()J METHOD method_41327 isRunning ()Z diff --git a/mappings/net/minecraft/entity/ai/WardenAngerManager.mapping b/mappings/net/minecraft/entity/ai/WardenAngerManager.mapping index 1f72b16dd5..c3511ad9fa 100644 --- a/mappings/net/minecraft/entity/ai/WardenAngerManager.mapping +++ b/mappings/net/minecraft/entity/ai/WardenAngerManager.mapping @@ -1,14 +1,11 @@ CLASS net/minecraft/class_7254 net/minecraft/entity/ai/WardenAngerManager - FIELD field_38127 CODEC Lcom/mojang/serialization/Codec; FIELD field_38128 maxAnger I FIELD field_38129 angerDecreasePerTick I FIELD field_38130 suspectsToAngerLevel Lit/unimi/dsi/fastutil/objects/Object2IntMap; - FIELD field_38734 suspects Ljava/util/SortedSet; + FIELD field_38734 suspects Ljava/util/ArrayList; FIELD field_38735 suspectUuidsToAngerLevel Lit/unimi/dsi/fastutil/objects/Object2IntMap; FIELD field_38736 updateTimer I FIELD field_38737 SUSPECT_CODEC Lcom/mojang/serialization/Codec; - METHOD (Ljava/util/List;)V - ARG 1 suspects METHOD method_42176 tick (Lnet/minecraft/class_3218;Ljava/util/function/Predicate;)V ARG 1 world ARG 2 suspectPredicate @@ -21,8 +18,6 @@ CLASS net/minecraft/class_7254 net/minecraft/entity/ai/WardenAngerManager ARG 1 entity ARG 2 amount METHOD method_42181 getPrimeSuspect ()Ljava/util/Optional; - METHOD method_42182 (Lcom/mojang/serialization/codecs/RecordCodecBuilder$Instance;)Lcom/mojang/datafixers/kinds/App; - ARG 0 instance METHOD method_42185 getPrimeSuspectAnger ()I METHOD method_42186 (Lnet/minecraft/class_1297;)Lnet/minecraft/class_1309; ARG 0 suspect diff --git a/mappings/net/minecraft/entity/ai/brain/task/StartSniffingTask.mapping b/mappings/net/minecraft/entity/ai/brain/task/StartSniffingTask.mapping index 0502974f7d..b6044158db 100644 --- a/mappings/net/minecraft/entity/ai/brain/task/StartSniffingTask.mapping +++ b/mappings/net/minecraft/entity/ai/brain/task/StartSniffingTask.mapping @@ -1,2 +1,2 @@ CLASS net/minecraft/class_7259 net/minecraft/entity/ai/brain/task/StartSniffingTask - FIELD field_38133 COOLDOWN I + FIELD field_38133 COOLDOWN Lnet/minecraft/class_6017; diff --git a/mappings/net/minecraft/entity/data/TrackedDataHandler.mapping b/mappings/net/minecraft/entity/data/TrackedDataHandler.mapping index 94745df294..10ef01d217 100644 --- a/mappings/net/minecraft/entity/data/TrackedDataHandler.mapping +++ b/mappings/net/minecraft/entity/data/TrackedDataHandler.mapping @@ -19,10 +19,6 @@ CLASS net/minecraft/class_2941 net/minecraft/entity/data/TrackedDataHandler ARG 0 enum_ METHOD method_43241 (Ljava/lang/Class;Lnet/minecraft/class_2540;)Ljava/lang/Enum; ARG 1 buf - METHOD method_43242 of (Ljava/util/function/BiConsumer;Ljava/util/function/Function;)Lnet/minecraft/class_2941; - ARG 0 writer - ARG 1 reader - METHOD method_43243 ofOptional (Ljava/util/function/BiConsumer;Ljava/util/function/Function;)Lnet/minecraft/class_2941; - ARG 0 writer - ARG 1 reader + METHOD method_43242 of (Lnet/minecraft/class_2540$class_7462;Lnet/minecraft/class_2540$class_7461;)Lnet/minecraft/class_2941; + METHOD method_43243 ofOptional (Lnet/minecraft/class_2540$class_7462;Lnet/minecraft/class_2540$class_7461;)Lnet/minecraft/class_2941; CLASS class_7394 ImmutableHandler diff --git a/mappings/net/minecraft/entity/effect/StatusEffectInstance.mapping b/mappings/net/minecraft/entity/effect/StatusEffectInstance.mapping index 830f8c6873..9c63fbf752 100644 --- a/mappings/net/minecraft/entity/effect/StatusEffectInstance.mapping +++ b/mappings/net/minecraft/entity/effect/StatusEffectInstance.mapping @@ -99,13 +99,9 @@ CLASS net/minecraft/class_1293 net/minecraft/entity/effect/StatusEffectInstance FIELD field_38091 hadEffectLastTick Z METHOD (I)V ARG 1 paddingDuration - METHOD (IFFIFZ)V + METHOD (IFFFIFZ)V ARG 1 paddingDuration ARG 2 factorTarget - ARG 3 factorCurrent - ARG 4 effectChangedTimestamp - ARG 5 factorPreviousFrame - ARG 6 hadEffectLastTick METHOD method_42134 lerp (F)F ARG 1 factor METHOD method_42135 (Lnet/minecraft/class_1293$class_7247;)Ljava/lang/Boolean; diff --git a/mappings/net/minecraft/entity/mob/WardenEntity.mapping b/mappings/net/minecraft/entity/mob/WardenEntity.mapping index 650d580125..53374937ca 100644 --- a/mappings/net/minecraft/entity/mob/WardenEntity.mapping +++ b/mappings/net/minecraft/entity/mob/WardenEntity.mapping @@ -19,8 +19,6 @@ CLASS net/minecraft/class_7260 net/minecraft/entity/mob/WardenEntity ARG 1 animationState METHOD method_42206 isValidTarget (Lnet/minecraft/class_1297;)Z ARG 1 entity - METHOD method_42207 (Lnet/minecraft/class_1297;Lnet/minecraft/class_1309;)Ljava/lang/Boolean; - ARG 1 suspect METHOD method_42208 (Lnet/minecraft/class_7254;)V ARG 1 angerManager METHOD method_42209 (Lnet/minecraft/class_2487;Lnet/minecraft/class_2520;)V @@ -39,8 +37,6 @@ CLASS net/minecraft/class_7260 net/minecraft/entity/mob/WardenEntity METHOD method_42217 updateAnger ()V METHOD method_42218 getHeartRate ()I METHOD method_42219 playListeningSound ()V - METHOD method_42220 (Lnet/minecraft/class_1309;)Z - ARG 0 entity METHOD method_42221 addAttributes ()Lnet/minecraft/class_5132$class_5133; METHOD method_42222 getAnger ()I METHOD method_42223 getTendrilPitch (F)F diff --git a/mappings/net/minecraft/entity/player/PlayerEntity.mapping b/mappings/net/minecraft/entity/player/PlayerEntity.mapping index f1221da0c3..b7d9c852ca 100644 --- a/mappings/net/minecraft/entity/player/PlayerEntity.mapping +++ b/mappings/net/minecraft/entity/player/PlayerEntity.mapping @@ -38,7 +38,7 @@ CLASS net/minecraft/class_1657 net/minecraft/entity/player/PlayerEntity FIELD field_7523 reducedDebugInfo Z FIELD field_7524 prevCapeX D FIELD field_7525 selectedItem Lnet/minecraft/class_1799; - METHOD (Lnet/minecraft/class_1937;Lnet/minecraft/class_2338;FLcom/mojang/authlib/GameProfile;)V + METHOD (Lnet/minecraft/class_1937;Lnet/minecraft/class_2338;FLcom/mojang/authlib/GameProfile;Lnet/minecraft/class_7428;)V ARG 1 world ARG 2 pos ARG 3 yaw @@ -115,7 +115,6 @@ CLASS net/minecraft/class_1657 net/minecraft/entity/player/PlayerEntity METHOD method_43120 setLastDeathPos (Ljava/util/Optional;)V ARG 1 lastDeathPos METHOD method_43122 getLastDeathPos ()Ljava/util/Optional; - METHOD method_43545 asChatMessageSender ()Lnet/minecraft/class_7436; METHOD method_7254 unlockRecipes (Ljava/util/Collection;)I ARG 1 recipes METHOD method_7255 addExperience (I)V diff --git a/mappings/net/minecraft/item/BannerPatternItem.mapping b/mappings/net/minecraft/item/BannerPatternItem.mapping index 21894b64cb..ab827786ec 100644 --- a/mappings/net/minecraft/item/BannerPatternItem.mapping +++ b/mappings/net/minecraft/item/BannerPatternItem.mapping @@ -1,7 +1,6 @@ CLASS net/minecraft/class_1745 net/minecraft/item/BannerPatternItem - FIELD field_7900 pattern Lnet/minecraft/class_2582; - METHOD (Lnet/minecraft/class_2582;Lnet/minecraft/class_1792$class_1793;)V - ARG 1 pattern + FIELD field_7900 pattern Lnet/minecraft/class_6862; + METHOD (Lnet/minecraft/class_6862;Lnet/minecraft/class_1792$class_1793;)V ARG 2 settings METHOD method_7703 getDescription ()Lnet/minecraft/class_5250; - METHOD method_7704 getPattern ()Lnet/minecraft/class_2582; + METHOD method_7704 getPattern ()Lnet/minecraft/class_6862; diff --git a/mappings/net/minecraft/item/GoatHornItem.mapping b/mappings/net/minecraft/item/GoatHornItem.mapping index 709872298f..92bec17b89 100644 --- a/mappings/net/minecraft/item/GoatHornItem.mapping +++ b/mappings/net/minecraft/item/GoatHornItem.mapping @@ -1,21 +1,9 @@ CLASS net/minecraft/class_7430 net/minecraft/item/GoatHornItem FIELD field_39052 SOUND_VARIANT_KEY Ljava/lang/String; - METHOD method_43558 getStackForSoundVariant (I)Lnet/minecraft/class_1799; - ARG 0 soundVariant - METHOD method_43559 getRandomSoundVariant (Lnet/minecraft/class_5819;Z)I - ARG 0 random - ARG 1 screaming - METHOD method_43560 getStackForGoat (Lnet/minecraft/class_6053;)Lnet/minecraft/class_1799; - ARG 0 goat - METHOD method_43561 setSoundVariant (Lnet/minecraft/class_1799;I)V + METHOD method_43558 getStackForSoundVariant (Lnet/minecraft/class_1792;Lnet/minecraft/class_6880;)Lnet/minecraft/class_1799; + METHOD method_43561 setSoundVariant (Lnet/minecraft/class_1799;Lnet/minecraft/class_6880;)V ARG 0 stack - ARG 1 soundVariant - METHOD method_43562 setRandomSoundVariant (Lnet/minecraft/class_1799;Lnet/minecraft/class_5819;)V - ARG 0 stack - ARG 1 random - METHOD method_43563 playSound (Lnet/minecraft/class_1937;Lnet/minecraft/class_1657;Lnet/minecraft/class_3414;)V - ARG 0 world + METHOD method_43562 setRandomSoundVariant (Lnet/minecraft/class_1799;Lnet/minecraft/class_6862;Lnet/minecraft/class_5819;)V + METHOD method_43563 playSound (Lnet/minecraft/class_1937;Lnet/minecraft/class_1657;Lnet/minecraft/class_7444;)V ARG 1 player - ARG 2 sound - METHOD method_43564 getSoundVariant (Lnet/minecraft/class_1799;)I - ARG 1 stack + METHOD method_43564 getSoundVariant (Lnet/minecraft/class_1799;)Lnet/minecraft/class_2960; diff --git a/mappings/net/minecraft/loot/condition/LootConditionConsumingBuilder.mapping b/mappings/net/minecraft/loot/condition/LootConditionConsumingBuilder.mapping index bce28db714..494a62fc9f 100644 --- a/mappings/net/minecraft/loot/condition/LootConditionConsumingBuilder.mapping +++ b/mappings/net/minecraft/loot/condition/LootConditionConsumingBuilder.mapping @@ -1,4 +1,4 @@ CLASS net/minecraft/class_192 net/minecraft/loot/condition/LootConditionConsumingBuilder - METHOD method_512 getThis ()Ljava/lang/Object; - METHOD method_840 conditionally (Lnet/minecraft/class_5341$class_210;)Ljava/lang/Object; + METHOD method_512 getThis ()Lnet/minecraft/class_192; + METHOD method_840 conditionally (Lnet/minecraft/class_5341$class_210;)Lnet/minecraft/class_192; ARG 1 condition diff --git a/mappings/net/minecraft/loot/function/LootFunctionConsumingBuilder.mapping b/mappings/net/minecraft/loot/function/LootFunctionConsumingBuilder.mapping index 2c92daab4a..561d9552b7 100644 --- a/mappings/net/minecraft/loot/function/LootFunctionConsumingBuilder.mapping +++ b/mappings/net/minecraft/loot/function/LootFunctionConsumingBuilder.mapping @@ -1,4 +1,3 @@ CLASS net/minecraft/class_116 net/minecraft/loot/function/LootFunctionConsumingBuilder - METHOD method_511 apply (Lnet/minecraft/class_117$class_118;)Ljava/lang/Object; + METHOD method_511 apply (Lnet/minecraft/class_117$class_118;)Lnet/minecraft/class_116; ARG 1 function - METHOD method_512 getThis ()Ljava/lang/Object; diff --git a/mappings/net/minecraft/loot/function/SetBannerPatternFunction.mapping b/mappings/net/minecraft/loot/function/SetBannerPatternFunction.mapping index fdcd01eb06..d70d7d7f8e 100644 --- a/mappings/net/minecraft/loot/function/SetBannerPatternFunction.mapping +++ b/mappings/net/minecraft/loot/function/SetBannerPatternFunction.mapping @@ -13,6 +13,5 @@ CLASS net/minecraft/class_5592 net/minecraft/loot/function/SetBannerPatternFunct FIELD field_31863 append Z METHOD (Z)V ARG 1 append - METHOD method_35533 pattern (Lnet/minecraft/class_2582;Lnet/minecraft/class_1767;)Lnet/minecraft/class_5592$class_6157; - ARG 1 pattern + METHOD method_35533 pattern (Lnet/minecraft/class_6880;Lnet/minecraft/class_1767;)Lnet/minecraft/class_5592$class_6157; ARG 2 color diff --git a/mappings/net/minecraft/loot/function/SetGoatHornSoundLootFunction.mapping b/mappings/net/minecraft/loot/function/SetGoatHornSoundLootFunction.mapping index 749d9dcb70..6a394bb70c 100644 --- a/mappings/net/minecraft/loot/function/SetGoatHornSoundLootFunction.mapping +++ b/mappings/net/minecraft/loot/function/SetGoatHornSoundLootFunction.mapping @@ -1,3 +1,3 @@ CLASS net/minecraft/class_7431 net/minecraft/loot/function/SetGoatHornSoundLootFunction - METHOD method_43571 builder ()Lnet/minecraft/class_120$class_121; + METHOD method_43571 builder (Lnet/minecraft/class_6862;)Lnet/minecraft/class_120$class_121; CLASS class_7432 Serializer diff --git a/mappings/net/minecraft/network/MessageType.mapping b/mappings/net/minecraft/network/MessageType.mapping index 43656941d7..be380b2dad 100644 --- a/mappings/net/minecraft/network/MessageType.mapping +++ b/mappings/net/minecraft/network/MessageType.mapping @@ -1,10 +1 @@ CLASS net/minecraft/class_2556 net/minecraft/network/MessageType - FIELD field_11736 id B - FIELD field_18797 interruptsNarration Z - METHOD (Ljava/lang/String;IBZ)V - ARG 3 id - ARG 4 interruptsNarration - METHOD method_10842 byId (B)Lnet/minecraft/class_2556; - ARG 0 id - METHOD method_10843 getId ()B - METHOD method_19457 interruptsNarration ()Z diff --git a/mappings/net/minecraft/network/PacketByteBuf.mapping b/mappings/net/minecraft/network/PacketByteBuf.mapping index 409ef647ed..b471b55913 100644 --- a/mappings/net/minecraft/network/PacketByteBuf.mapping +++ b/mappings/net/minecraft/network/PacketByteBuf.mapping @@ -705,7 +705,7 @@ CLASS net/minecraft/class_2540 net/minecraft/network/PacketByteBuf COMMENT the list to write METHOD method_34061 (Ljava/lang/Object;Lcom/mojang/serialization/DataResult$PartialResult;)V ARG 1 partial - METHOD method_34062 writeCollection (Ljava/util/Collection;Ljava/util/function/BiConsumer;)V + METHOD method_34062 writeCollection (Ljava/util/Collection;Lnet/minecraft/class_2540$class_7462;)V COMMENT Writes a collection to this buf. The collection is stored as a leading COMMENT {@linkplain #readVarInt() var int} size followed by the entries COMMENT sequentially. @@ -714,9 +714,7 @@ CLASS net/minecraft/class_2540 net/minecraft/network/PacketByteBuf COMMENT @see #readCollection(IntFunction, Function) ARG 1 collection COMMENT the collection to write - ARG 2 entrySerializer - COMMENT a serializer that writes each entry to this buf - METHOD method_34063 writeMap (Ljava/util/Map;Ljava/util/function/BiConsumer;Ljava/util/function/BiConsumer;)V + METHOD method_34063 writeMap (Ljava/util/Map;Lnet/minecraft/class_2540$class_7462;Lnet/minecraft/class_2540$class_7462;)V COMMENT Writes a map to this buf. The map is stored as a leading COMMENT {@linkplain #readVarInt() var int} size followed by each key and value COMMENT pair. @@ -726,11 +724,7 @@ CLASS net/minecraft/class_2540 net/minecraft/network/PacketByteBuf COMMENT @see #readMap(IntFunction, Function, Function) ARG 1 map COMMENT the map to write - ARG 2 keySerializer - COMMENT a serializer that writes each key in the map to this buf - ARG 3 valueSerializer - COMMENT a serializer that writes each value in the map to this buf - METHOD method_34064 (Ljava/util/function/BiConsumer;Ljava/util/function/BiConsumer;Ljava/lang/Object;Ljava/lang/Object;)V + METHOD method_34064 (Lnet/minecraft/class_2540$class_7462;Lnet/minecraft/class_2540$class_7462;Ljava/lang/Object;Ljava/lang/Object;)V ARG 3 key ARG 4 value METHOD method_34065 forEachInCollection (Ljava/util/function/Consumer;)V @@ -741,26 +735,20 @@ CLASS net/minecraft/class_2540 net/minecraft/network/PacketByteBuf COMMENT @see #readCollection(IntFunction, Function) ARG 1 consumer COMMENT the consumer to read entries - METHOD method_34066 readList (Ljava/util/function/Function;)Ljava/util/List; + METHOD method_34066 readList (Lnet/minecraft/class_2540$class_7461;)Ljava/util/List; COMMENT Reads a collection from this buf as an array list. COMMENT COMMENT @param the list's entry type COMMENT @return the read list COMMENT @see #readCollection(IntFunction, Function) - ARG 1 entryParser - COMMENT a parser that parses each entry for the collection given this buf - METHOD method_34067 readMap (Ljava/util/function/Function;Ljava/util/function/Function;)Ljava/util/Map; + METHOD method_34067 readMap (Lnet/minecraft/class_2540$class_7461;Lnet/minecraft/class_2540$class_7461;)Ljava/util/Map; COMMENT Reads a map from this buf as a hash map. COMMENT COMMENT @param the key type COMMENT @param the value type COMMENT @return the read map COMMENT @see #readMap(IntFunction, Function, Function) - ARG 1 keyParser - COMMENT a parser that parses each key for the map given this buf - ARG 2 valueParser - COMMENT a parser that parses each value for the map given this buf - METHOD method_34068 readCollection (Ljava/util/function/IntFunction;Ljava/util/function/Function;)Ljava/util/Collection; + METHOD method_34068 readCollection (Ljava/util/function/IntFunction;Lnet/minecraft/class_2540$class_7461;)Ljava/util/Collection; COMMENT Reads a collection from this buf. The collection is stored as a leading COMMENT {@linkplain #readVarInt() var int} size followed by the entries COMMENT sequentially. @@ -772,9 +760,7 @@ CLASS net/minecraft/class_2540 net/minecraft/network/PacketByteBuf COMMENT @see #readList(Function) ARG 1 collectionFactory COMMENT a factory that creates a collection with a given size - ARG 2 entryParser - COMMENT a parser that parses each entry for the collection given this buf - METHOD method_34069 readMap (Ljava/util/function/IntFunction;Ljava/util/function/Function;Ljava/util/function/Function;)Ljava/util/Map; + METHOD method_34069 readMap (Ljava/util/function/IntFunction;Lnet/minecraft/class_2540$class_7461;Lnet/minecraft/class_2540$class_7461;)Ljava/util/Map; COMMENT Reads a map from this buf. The map is stored as a leading COMMENT {@linkplain #readVarInt() var int} size followed by each key and value COMMENT pair. @@ -787,10 +773,6 @@ CLASS net/minecraft/class_2540 net/minecraft/network/PacketByteBuf COMMENT @see #readMap(Function, Function) ARG 1 mapFactory COMMENT a factory that creates a map with a given size - ARG 2 keyParser - COMMENT a parser that parses each key for the map given this buf - ARG 3 valueParser - COMMENT a parser that parses each value for the map given this buf METHOD method_34070 (Lnet/minecraft/class_2487;Lcom/mojang/serialization/DataResult$PartialResult;)V ARG 1 partial METHOD method_36129 getVarLongLength (J)I @@ -826,22 +808,20 @@ CLASS net/minecraft/class_2540 net/minecraft/network/PacketByteBuf COMMENT COMMENT @return the read chunk position COMMENT @see #writeChunkPos(ChunkPos) - METHOD method_37435 writeOptional (Ljava/util/Optional;Ljava/util/function/BiConsumer;)V + METHOD method_37435 writeOptional (Ljava/util/Optional;Lnet/minecraft/class_2540$class_7462;)V COMMENT Writes an optional value to this buf. An optional value is represented by COMMENT a boolean indicating if the value is present, followed by the value only if COMMENT the value is present. COMMENT COMMENT @see #readOptional(Function) ARG 1 value - ARG 2 serializer - METHOD method_37436 readOptional (Ljava/util/function/Function;)Ljava/util/Optional; + METHOD method_37436 readOptional (Lnet/minecraft/class_2540$class_7461;)Ljava/util/Optional; COMMENT Reads an optional value from this buf. An optional value is represented by COMMENT a boolean indicating if the value is present, followed by the value only if COMMENT the value is present. COMMENT COMMENT @return the read optional value COMMENT @see #writeOptional(Optional, BiConsumer) - ARG 1 parser METHOD method_37452 (ILjava/util/function/IntFunction;I)Ljava/lang/Object; ARG 2 value METHOD method_37453 getMaxValidator (Ljava/util/function/IntFunction;I)Ljava/util/function/IntFunction; @@ -888,28 +868,24 @@ CLASS net/minecraft/class_2540 net/minecraft/network/PacketByteBuf ARG 1 property METHOD method_43618 (Lcom/mojang/authlib/properties/PropertyMap;Lnet/minecraft/class_2540;)V ARG 2 buf - METHOD method_43619 writeEither (Lcom/mojang/datafixers/util/Either;Ljava/util/function/BiConsumer;Ljava/util/function/BiConsumer;)V + METHOD method_43619 writeEither (Lcom/mojang/datafixers/util/Either;Lnet/minecraft/class_2540$class_7462;Lnet/minecraft/class_2540$class_7462;)V COMMENT Writes an {@code Either} to this buf. An either is represented by COMMENT a boolean indicating if the left side or the right side of the either, COMMENT followed by the value. COMMENT COMMENT @see #readEither(Function, Function) ARG 1 either - ARG 2 leftSerializer - ARG 3 rightSerializer - METHOD method_43620 (Ljava/util/function/BiConsumer;Ljava/lang/Object;)V + METHOD method_43620 (Lnet/minecraft/class_2540$class_7462;Ljava/lang/Object;)V ARG 2 object - METHOD method_43621 (Ljava/util/function/BiConsumer;Ljava/lang/Object;)V + METHOD method_43621 (Lnet/minecraft/class_2540$class_7462;Ljava/lang/Object;)V ARG 2 object - METHOD method_43622 readEither (Ljava/util/function/Function;Ljava/util/function/Function;)Lcom/mojang/datafixers/util/Either; + METHOD method_43622 readEither (Lnet/minecraft/class_2540$class_7461;Lnet/minecraft/class_2540$class_7461;)Lcom/mojang/datafixers/util/Either; COMMENT Reads an {@code Either} from this buf. An either is represented by COMMENT a boolean indicating if the left side or the right side of the either, COMMENT followed by the value. COMMENT COMMENT @return the read either COMMENT @see #writeEither(Either, BiConsumer, BiConsumer) - ARG 1 leftParser - ARG 2 rightParser METHOD method_43623 readGameProfile ()Lcom/mojang/authlib/GameProfile; COMMENT Reads a game profile from this buf. A game profile is represented by a COMMENT {@linkplain #readUuid() uuid}, a username string, and a collection of diff --git a/mappings/net/minecraft/network/encryption/NetworkEncryptionUtils.mapping b/mappings/net/minecraft/network/encryption/NetworkEncryptionUtils.mapping index 016b5a9596..167d009c41 100644 --- a/mappings/net/minecraft/network/encryption/NetworkEncryptionUtils.mapping +++ b/mappings/net/minecraft/network/encryption/NetworkEncryptionUtils.mapping @@ -100,10 +100,6 @@ CLASS net/minecraft/class_3515 net/minecraft/network/encryption/NetworkEncryptio ARG 0 opMode ARG 1 key ARG 2 data - METHOD method_43518 uuidToBytes (JJ)[B - COMMENT {@return the UUID converted to a big-endian byte array} - ARG 0 mostSignificant - ARG 2 leastSignificant METHOD method_43519 decodeRsaPrivateKeyPem (Ljava/lang/String;)Ljava/security/PrivateKey; COMMENT Decodes a PEM-formatted RSA private key. COMMENT @@ -155,23 +151,6 @@ CLASS net/minecraft/class_3515 net/minecraft/network/encryption/NetworkEncryptio COMMENT @see #decodeRsaPrivateKeyPem(String) COMMENT @see #decodeRsaPublicKeyPem(String) ARG 0 key - METHOD method_43523 updateSignature (Ljava/security/Signature;JLjava/util/UUID;Ljava/time/Instant;Ljava/lang/String;)V - COMMENT Updates {@code signature} with the passed parameters. - COMMENT - COMMENT @apiNote This is used when signing chat message contents. - COMMENT - COMMENT @implNote The data to be signed is {@code salt}, followed by big-endian ordered - COMMENT {@code uuid}, followed by {@code time} as seconds from the UTC epoch, followed by - COMMENT UTF-8 encoded {@code message} bytes. - COMMENT - COMMENT @throws SignatureException when updating signature fails - COMMENT - COMMENT @see net.minecraft.client.network.ClientPlayerEntity#signChatMessage(Instant, String) - ARG 0 signature - ARG 1 salt - ARG 3 uuid - ARG 4 time - ARG 5 message METHOD method_43524 decodeRsaPublicKeyPem (Ljava/lang/String;)Ljava/security/PublicKey; COMMENT Decodes a PEM-formatted RSA public key. COMMENT diff --git a/mappings/net/minecraft/network/encryption/PlayerPublicKey.mapping b/mappings/net/minecraft/network/encryption/PlayerPublicKey.mapping index 3b3246262c..7175f4629c 100644 --- a/mappings/net/minecraft/network/encryption/PlayerPublicKey.mapping +++ b/mappings/net/minecraft/network/encryption/PlayerPublicKey.mapping @@ -6,24 +6,9 @@ CLASS net/minecraft/class_7428 net/minecraft/network/encryption/PlayerPublicKey COMMENT COMMENT @see net.minecraft.client.util.ProfileKeys COMMENT @see PlayerKeyPair - FIELD comp_745 Ljava/lang/String; - COMMENT the PEM-formatted X.509 encoded key - FIELD comp_746 Ljava/lang/String; - COMMENT the signature certifying that this key is provided from Mojang's server FIELD field_39050 CODEC Lcom/mojang/serialization/Codec; FIELD field_39051 PUBLIC_KEY Ljava/lang/String; - METHOD (Lcom/mojang/datafixers/util/Pair;Ljava/lang/String;)V - ARG 1 expiresAtAndKey - ARG 2 signature - METHOD method_43548 toProperty ()Lcom/mojang/authlib/properties/Property; - COMMENT {@return the public key as an authlib {@code Property}} - METHOD method_43549 fromGameProfile (Lcom/mojang/authlib/GameProfile;)Ljava/util/Optional; - COMMENT {@return the public key extracted from the {@code gameProfile}} - COMMENT - COMMENT @apiNote This can return an {@linkplain java.util.Optional#empty() empty value} - COMMENT if the profile lacks the public key. - ARG 0 gameProfile - METHOD method_43550 verifyAndDecode (Lcom/mojang/authlib/minecraft/MinecraftSessionService;)Lnet/minecraft/class_7428$class_7429; + METHOD method_43550 verifyAndDecode (Lcom/mojang/authlib/minecraft/MinecraftSessionService;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, @@ -32,32 +17,3 @@ CLASS net/minecraft/class_7428 net/minecraft/network/encryption/PlayerPublicKey COMMENT @throws InsecurePublicKeyException.MissingException when the key is missing or empty COMMENT @throws InsecurePublicKeyException.InvalidException when the key is unsigned or expired COMMENT @throws NetworkEncryptionException when the key is malformed - ARG 1 sessionService - METHOD method_43551 (Lcom/mojang/serialization/codecs/RecordCodecBuilder$Instance;)Lcom/mojang/datafixers/kinds/App; - ARG 0 instance - METHOD method_43552 parse (Ljava/lang/String;)Ljava/util/Optional; - COMMENT {@return the expiry time and the key content parsed from {@code contents}} - ARG 0 contents - METHOD method_43553 (Ljava/lang/String;Lcom/mojang/datafixers/util/Pair;)Lnet/minecraft/class_7428; - ARG 1 pair - METHOD method_43554 isExpired ()Z - COMMENT {@return whether the key is expired and can no longer be used} - METHOD method_43555 write (Lcom/mojang/authlib/GameProfile;)Lcom/mojang/authlib/GameProfile; - COMMENT Writes the public key to the {@code gameProfile} properties under the - COMMENT {@value PUBLIC_KEY} key. - ARG 1 gameProfile - CLASS class_7429 PublicKeyData - COMMENT A record holding a player's RSA public key data. - COMMENT - COMMENT

This should not be manually created. Use - COMMENT {@link PlayerPublicKey#verifyAndDecode(MinecraftSessionService)} to obtain an instance. - METHOD method_43557 createSignatureInstance ()Ljava/security/Signature; - COMMENT {@return the SHA1withRSA signature instance used for verifying signatures} - COMMENT - COMMENT @apiNote The returned signature cannot be used for signing. Use {#link - COMMENT net.minecraft.client.util.ProfileKeys#createSignatureInstance()} to create the - COMMENT signature for signing the data. - COMMENT - COMMENT @throws NetworkEncryptionException when creation fails - COMMENT - COMMENT @see net.minecraft.client.util.ProfileKeys#createSignatureInstance() diff --git a/mappings/net/minecraft/network/packet/c2s/login/LoginKeyC2SPacket.mapping b/mappings/net/minecraft/network/packet/c2s/login/LoginKeyC2SPacket.mapping index bee18713e4..cdb42262e2 100644 --- a/mappings/net/minecraft/network/packet/c2s/login/LoginKeyC2SPacket.mapping +++ b/mappings/net/minecraft/network/packet/c2s/login/LoginKeyC2SPacket.mapping @@ -21,14 +21,14 @@ CLASS net/minecraft/class_2917 net/minecraft/network/packet/c2s/login/LoginKeyC2 ARG 1 buf METHOD method_12654 decryptSecretKey (Ljava/security/PrivateKey;)Ljavax/crypto/SecretKey; ARG 1 privateKey - METHOD method_43640 (Lnet/minecraft/class_7428$class_7429;[BLnet/minecraft/class_3515$class_7425;)Ljava/lang/Boolean; + METHOD method_43640 (Lnet/minecraft/class_7428;[BLnet/minecraft/class_3515$class_7425;)Ljava/lang/Boolean; ARG 2 signature METHOD method_43641 (Lnet/minecraft/class_2540;Lnet/minecraft/class_3515$class_7425;)V ARG 0 buf ARG 1 signature METHOD method_43642 ([B)Ljava/lang/Boolean; ARG 0 encrypted - METHOD method_43643 verifySignedNonce ([BLnet/minecraft/class_7428$class_7429;)Z + METHOD method_43643 verifySignedNonce ([BLnet/minecraft/class_7428;)Z ARG 1 nonce ARG 2 publicKeyInfo METHOD method_43644 verifyEncryptedNonce ([BLjava/security/PrivateKey;)Z diff --git a/mappings/net/minecraft/network/packet/c2s/login/LoginQueryResponseC2SPacket.mapping b/mappings/net/minecraft/network/packet/c2s/login/LoginQueryResponseC2SPacket.mapping index 06319203bf..a288a95745 100644 --- a/mappings/net/minecraft/network/packet/c2s/login/LoginQueryResponseC2SPacket.mapping +++ b/mappings/net/minecraft/network/packet/c2s/login/LoginQueryResponseC2SPacket.mapping @@ -5,7 +5,5 @@ CLASS net/minecraft/class_2913 net/minecraft/network/packet/c2s/login/LoginQuery METHOD (ILnet/minecraft/class_2540;)V ARG 1 queryId ARG 2 response - METHOD (Lnet/minecraft/class_2540;)V - ARG 1 buf METHOD method_36178 getQueryId ()I METHOD method_36179 getResponse ()Lnet/minecraft/class_2540; diff --git a/mappings/net/minecraft/network/packet/c2s/play/ChatMessageC2SPacket.mapping b/mappings/net/minecraft/network/packet/c2s/play/ChatMessageC2SPacket.mapping index bedd89f460..9d5c5f38b9 100644 --- a/mappings/net/minecraft/network/packet/c2s/play/ChatMessageC2SPacket.mapping +++ b/mappings/net/minecraft/network/packet/c2s/play/ChatMessageC2SPacket.mapping @@ -16,27 +16,14 @@ CLASS net/minecraft/class_2797 net/minecraft/network/packet/c2s/play/ChatMessage COMMENT @see net.minecraft.client.network.ClientPlayerEntity#sendChatMessage COMMENT @see net.minecraft.server.network.ServerPlayNetworkHandler#onChatMessage FIELD field_12764 chatMessage Ljava/lang/String; - FIELD field_33359 MAX_LENGTH I FIELD field_39086 TIME_TO_LIVE Ljava/time/Duration; FIELD field_39087 time Ljava/time/Instant; FIELD field_39088 signature Lnet/minecraft/class_3515$class_7425; - METHOD (Ljava/time/Instant;Ljava/lang/String;Lnet/minecraft/class_3515$class_7425;)V - ARG 1 time - ARG 2 chatMessage - ARG 3 signature METHOD (Lnet/minecraft/class_2540;)V ARG 1 buf METHOD method_12114 getChatMessage ()Ljava/lang/String; - METHOD method_43632 truncateMessage (Ljava/lang/String;)Ljava/lang/String; - COMMENT {@return the message truncated to at most {@value #MAX_LENGTH} characters} - ARG 0 message METHOD method_43633 isExpired (Ljava/time/Instant;)Z COMMENT {@return whether the message is considered expired and should be discarded} ARG 1 currentTime - METHOD method_43634 getTime ()Ljava/time/Instant; - COMMENT {@return when the client sent the message to the server} - METHOD method_43635 getNormalizedChatMessage ()Ljava/lang/String; - COMMENT {@return the chat message with spaces normalized} - METHOD method_43636 getSignature ()Lnet/minecraft/class_3515$class_7425; METHOD method_43637 getExpiryTime ()Ljava/time/Instant; COMMENT {@return when the message is considered expired and should be discarded} diff --git a/mappings/net/minecraft/network/packet/s2c/play/ChatMessageS2CPacket.mapping b/mappings/net/minecraft/network/packet/s2c/play/ChatMessageS2CPacket.mapping index c68ca40941..dabbda9730 100644 --- a/mappings/net/minecraft/network/packet/s2c/play/ChatMessageS2CPacket.mapping +++ b/mappings/net/minecraft/network/packet/s2c/play/ChatMessageS2CPacket.mapping @@ -26,10 +26,6 @@ CLASS net/minecraft/class_7438 net/minecraft/network/packet/s2c/play/ChatMessage FIELD field_39085 TIME_TO_LIVE Ljava/time/Duration; METHOD (Lnet/minecraft/class_2540;)V ARG 1 buf - METHOD method_43627 isSignatureValid (Lnet/minecraft/class_7428$class_7429;)Z - COMMENT {@return whether the chat message has a valid signature} - ARG 1 publicKey - COMMENT the sender's public key to use for verifying METHOD method_43628 isExpired (Ljava/time/Instant;)Z COMMENT {@return whether the message is considered expired} ARG 1 currentTime diff --git a/mappings/net/minecraft/network/packet/s2c/play/MapUpdateS2CPacket.mapping b/mappings/net/minecraft/network/packet/s2c/play/MapUpdateS2CPacket.mapping index 107c6ba79a..2398481809 100644 --- a/mappings/net/minecraft/network/packet/s2c/play/MapUpdateS2CPacket.mapping +++ b/mappings/net/minecraft/network/packet/s2c/play/MapUpdateS2CPacket.mapping @@ -20,5 +20,3 @@ CLASS net/minecraft/class_2683 net/minecraft/network/packet/s2c/play/MapUpdateS2 METHOD method_34136 (Lnet/minecraft/class_2540;Lnet/minecraft/class_20;)V ARG 0 b ARG 1 icon - METHOD method_34137 (Lnet/minecraft/class_2540;)Lnet/minecraft/class_20; - ARG 0 b diff --git a/mappings/net/minecraft/network/packet/s2c/play/PlayerListS2CPacket.mapping b/mappings/net/minecraft/network/packet/s2c/play/PlayerListS2CPacket.mapping index 43970f113d..ca96b9c0d9 100644 --- a/mappings/net/minecraft/network/packet/s2c/play/PlayerListS2CPacket.mapping +++ b/mappings/net/minecraft/network/packet/s2c/play/PlayerListS2CPacket.mapping @@ -11,17 +11,12 @@ CLASS net/minecraft/class_2703 net/minecraft/network/packet/s2c/play/PlayerListS ARG 2 players METHOD method_11722 getEntries ()Ljava/util/List; METHOD method_11723 getAction ()Lnet/minecraft/class_2703$class_5893; - METHOD method_34148 writeOptionalText (Lnet/minecraft/class_2540;Lnet/minecraft/class_2561;)V - ARG 0 buf - ARG 1 text - METHOD method_34149 readOptionalText (Lnet/minecraft/class_2540;)Lnet/minecraft/class_2561; - ARG 0 buf CLASS class_2705 Entry FIELD field_12377 displayName Lnet/minecraft/class_2561; FIELD field_12378 latency I FIELD field_12379 gameMode Lnet/minecraft/class_1934; FIELD field_12380 profile Lcom/mojang/authlib/GameProfile; - METHOD (Lcom/mojang/authlib/GameProfile;ILnet/minecraft/class_1934;Lnet/minecraft/class_2561;)V + METHOD (Lcom/mojang/authlib/GameProfile;ILnet/minecraft/class_1934;Lnet/minecraft/class_2561;Lnet/minecraft/class_7428$class_7443;)V ARG 1 profile ARG 2 latency ARG 3 gameMode diff --git a/mappings/net/minecraft/network/packet/s2c/play/ResourcePackSendS2CPacket.mapping b/mappings/net/minecraft/network/packet/s2c/play/ResourcePackSendS2CPacket.mapping index db4f1ec7cf..e764bbdaec 100644 --- a/mappings/net/minecraft/network/packet/s2c/play/ResourcePackSendS2CPacket.mapping +++ b/mappings/net/minecraft/network/packet/s2c/play/ResourcePackSendS2CPacket.mapping @@ -9,8 +9,6 @@ CLASS net/minecraft/class_2720 net/minecraft/network/packet/s2c/play/ResourcePac ARG 2 hash ARG 3 required ARG 4 prompt - METHOD (Lnet/minecraft/class_2540;)V - ARG 1 buf METHOD method_11772 getURL ()Ljava/lang/String; METHOD method_11773 getSHA1 ()Ljava/lang/String; METHOD method_32307 isRequired ()Z diff --git a/mappings/net/minecraft/network/packet/s2c/play/SelectAdvancementTabS2CPacket.mapping b/mappings/net/minecraft/network/packet/s2c/play/SelectAdvancementTabS2CPacket.mapping index e2f0f90d19..4e1f9d49f1 100644 --- a/mappings/net/minecraft/network/packet/s2c/play/SelectAdvancementTabS2CPacket.mapping +++ b/mappings/net/minecraft/network/packet/s2c/play/SelectAdvancementTabS2CPacket.mapping @@ -1,7 +1,5 @@ CLASS net/minecraft/class_2729 net/minecraft/network/packet/s2c/play/SelectAdvancementTabS2CPacket FIELD field_12440 tabId Lnet/minecraft/class_2960; - METHOD (Lnet/minecraft/class_2540;)V - ARG 1 buf METHOD (Lnet/minecraft/class_2960;)V ARG 1 tabId METHOD method_11793 getTabId ()Lnet/minecraft/class_2960; diff --git a/mappings/net/minecraft/resource/DefaultResourcePack.mapping b/mappings/net/minecraft/resource/DefaultResourcePack.mapping index 42fa05edfa..1a7dbf6bc8 100644 --- a/mappings/net/minecraft/resource/DefaultResourcePack.mapping +++ b/mappings/net/minecraft/resource/DefaultResourcePack.mapping @@ -25,7 +25,7 @@ CLASS net/minecraft/class_3268 net/minecraft/resource/DefaultResourcePack METHOD method_20729 getPath (Lnet/minecraft/class_3264;Lnet/minecraft/class_2960;)Ljava/lang/String; ARG 0 type ARG 1 id - METHOD method_23857 (Ljava/lang/String;Ljava/nio/file/Path;Ljava/nio/file/Path;)Lnet/minecraft/class_2960; + METHOD method_23857 (Ljava/nio/file/Path;Ljava/lang/String;Ljava/nio/file/Path;Ljava/util/function/Consumer;)V ARG 2 path METHOD method_23858 (Ljava/nio/file/Path;)Z ARG 0 path diff --git a/mappings/net/minecraft/screen/LoomScreenHandler.mapping b/mappings/net/minecraft/screen/LoomScreenHandler.mapping index 0353a205a7..b674b126da 100644 --- a/mappings/net/minecraft/screen/LoomScreenHandler.mapping +++ b/mappings/net/minecraft/screen/LoomScreenHandler.mapping @@ -26,7 +26,7 @@ CLASS net/minecraft/class_1726 net/minecraft/screen/LoomScreenHandler METHOD method_17430 getPatternSlot ()Lnet/minecraft/class_1735; METHOD method_17431 getOutputSlot ()Lnet/minecraft/class_1735; METHOD method_7647 getSelectedPattern ()I - METHOD method_7648 updateOutputSlot ()V + METHOD method_7648 updateOutputSlot (Lnet/minecraft/class_6880;)V CLASS 6 METHOD method_17433 (Lnet/minecraft/class_1937;Lnet/minecraft/class_2338;)V ARG 1 world diff --git a/mappings/net/minecraft/server/MinecraftServer.mapping b/mappings/net/minecraft/server/MinecraftServer.mapping index 989a913f5d..1cd368852e 100644 --- a/mappings/net/minecraft/server/MinecraftServer.mapping +++ b/mappings/net/minecraft/server/MinecraftServer.mapping @@ -68,8 +68,6 @@ CLASS net/minecraft/server/MinecraftServer FIELD field_4571 timeReference J FIELD field_4572 ticks I FIELD field_4573 lastTickLengths [J - FIELD field_4578 singlePlayerName Ljava/lang/String; - FIELD field_4584 resourcePackHash Ljava/lang/String; FIELD field_4585 serverIp Ljava/lang/String; FIELD field_4587 dataFixer Lcom/mojang/datafixers/DataFixer; FIELD field_4588 USER_CACHE_FILE Ljava/io/File; @@ -83,7 +81,6 @@ CLASS net/minecraft/server/MinecraftServer FIELD field_4602 random Lnet/minecraft/class_5819; FIELD field_4603 sessionService Lcom/mojang/authlib/minecraft/MinecraftSessionService; FIELD field_4604 pvpEnabled Z - FIELD field_4607 resourcePackUrl Ljava/lang/String; FIELD field_4608 gameProfileRepo Lcom/mojang/authlib/GameProfileRepository; METHOD (Ljava/lang/Thread;Lnet/minecraft/class_32$class_5143;Lnet/minecraft/class_3283;Lnet/minecraft/class_6904;Ljava/net/Proxy;Lcom/mojang/datafixers/DataFixer;Lcom/mojang/authlib/minecraft/MinecraftSessionService;Lcom/mojang/authlib/GameProfileRepository;Lnet/minecraft/class_3312;Lnet/minecraft/class_3950;)V ARG 1 serverThread @@ -180,7 +177,6 @@ CLASS net/minecraft/server/MinecraftServer ARG 1 player METHOD method_34864 getResourceManager ()Lnet/minecraft/class_3300; METHOD method_36113 getProxy ()Ljava/net/Proxy; - METHOD method_36326 getResourcePackPrompt ()Lnet/minecraft/class_2561; METHOD method_37113 dumpProperties (Ljava/nio/file/Path;)V ARG 1 file METHOD method_3716 getKeyPair ()Ljava/security/KeyPair; @@ -293,7 +289,6 @@ CLASS net/minecraft/server/MinecraftServer COMMENT Gets the amount of ticks the server has been running for. METHOD method_3782 shutdown ()V METHOD method_3783 isMonsterSpawningEnabled ()Z - METHOD method_3784 getResourcePackUrl ()Ljava/lang/String; METHOD method_3785 isSpawnProtected (Lnet/minecraft/class_3218;Lnet/minecraft/class_2338;Lnet/minecraft/class_1657;)Z ARG 1 world ARG 2 pos @@ -312,17 +307,7 @@ CLASS net/minecraft/server/MinecraftServer METHOD method_3802 getMaxPlayerCount ()I METHOD method_3803 setPlayerIdleTimeout (I)V ARG 1 playerIdleTimeout - METHOD method_3805 getResourcePackHash ()Ljava/lang/String; METHOD method_3806 isRunning ()Z - METHOD method_3811 getSinglePlayerName ()Ljava/lang/String; - COMMENT {@return the name of the single player of this server} This may be - COMMENT {@code null} for non-singleplayer servers. - COMMENT - COMMENT

In vanilla, outside of integrated servers, this is used to - COMMENT determine to whom the {@code Player} NBT from {@code level.dat} applies. - COMMENT - COMMENT @see #setSinglePlayerName(String) - COMMENT @see #isSingleplayer() METHOD method_3812 areCommandBlocksEnabled ()Z COMMENT Specifies whether command blocks can execute commands on the server. METHOD method_3813 tickWorlds (Ljava/util/function/BooleanSupplier;)V @@ -369,27 +354,12 @@ CLASS net/minecraft/server/MinecraftServer METHOD method_3841 getSpawnProtectionRadius ()I METHOD method_3842 setServerIp (Ljava/lang/String;)V ARG 1 serverIp - METHOD method_3843 setResourcePack (Ljava/lang/String;Ljava/lang/String;)V - ARG 1 url - ARG 2 hash METHOD method_3844 getSessionService ()Lcom/mojang/authlib/minecraft/MinecraftSessionService; METHOD method_3845 getScoreboard ()Lnet/minecraft/class_2995; METHOD method_3846 setPlayerManager (Lnet/minecraft/class_3324;)V ARG 1 playerManager METHOD method_3847 getWorld (Lnet/minecraft/class_5321;)Lnet/minecraft/class_3218; ARG 1 key - METHOD method_3849 setSinglePlayerName (Ljava/lang/String;)V - COMMENT Sets the name of the single player of this server. - COMMENT - COMMENT

This is called by vanilla when setting up this server. The - COMMENT {@code singlePlayerName} is the client's player name for integrated - COMMENT servers and specified by the {@code --singleplayer } - COMMENT command-line argument or {@code null} for dedicated servers. - COMMENT - COMMENT @see #getSinglePlayerName() - COMMENT @see #isSingleplayer() - ARG 1 singlePlayerName - COMMENT the single player's name, or {@code null} for non-singleplayer servers METHOD method_3851 getAdvancementLoader ()Lnet/minecraft/class_2989; METHOD method_3852 isPvpEnabled ()Z METHOD method_3854 (Ljava/lang/Thread;Ljava/lang/Throwable;)V diff --git a/mappings/net/minecraft/server/PlayerManager.mapping b/mappings/net/minecraft/server/PlayerManager.mapping index 26a0c4808f..a74c4ebe33 100644 --- a/mappings/net/minecraft/server/PlayerManager.mapping +++ b/mappings/net/minecraft/server/PlayerManager.mapping @@ -100,7 +100,6 @@ CLASS net/minecraft/class_3324 net/minecraft/server/PlayerManager METHOD method_14597 disconnectAllPlayers ()V METHOD method_14599 reloadWhitelist ()V METHOD method_14600 loadPlayerData (Lnet/minecraft/class_3222;)Lnet/minecraft/class_2487; - ARG 1 player METHOD method_14601 updatePlayerLatency ()V METHOD method_14602 getPlayer (Ljava/util/UUID;)Lnet/minecraft/class_3222; ARG 1 uuid @@ -126,7 +125,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_7428;)Lnet/minecraft/class_3222; ARG 1 profile METHOD method_14614 isWhitelistEnabled ()Z METHOD method_14617 saveAllPlayerData ()V @@ -139,7 +138,7 @@ CLASS net/minecraft/class_3324 net/minecraft/server/PlayerManager METHOD method_38651 getSimulationDistance ()I METHOD method_43511 (Lnet/minecraft/class_2561;Lnet/minecraft/class_3222;)Lnet/minecraft/class_2561; ARG 1 player - METHOD method_43512 broadcast (Lnet/minecraft/class_2561;Ljava/util/function/Function;Lnet/minecraft/class_2556;)V + METHOD method_43512 broadcast (Lnet/minecraft/class_2561;Ljava/util/function/Function;Lnet/minecraft/class_5321;)V COMMENT Broadcasts a message to all players and the server console. A different COMMENT message can be sent to a different player. COMMENT @@ -153,8 +152,7 @@ CLASS net/minecraft/class_3324 net/minecraft/server/PlayerManager COMMENT a function that takes the player to send the message to COMMENT and returns either the text to send to them or {@code null} COMMENT to indicate the message should not be sent to them - ARG 3 type - METHOD method_43513 broadcast (Lnet/minecraft/class_2561;Ljava/util/function/Function;Lnet/minecraft/class_2556;Lnet/minecraft/class_7436;Ljava/time/Instant;Lnet/minecraft/class_3515$class_7425;)V + METHOD method_43513 broadcast (Lnet/minecraft/class_7471;Ljava/util/function/Function;Lnet/minecraft/class_7436;Lnet/minecraft/class_5321;)V COMMENT Broadcasts a chat message to all players and the server console. A different COMMENT message can be sent to a different player. COMMENT @@ -170,16 +168,11 @@ CLASS net/minecraft/class_3324 net/minecraft/server/PlayerManager COMMENT COMMENT @see #broadcast(Text, MessageType) COMMENT @see #broadcast(Text, Function, MessageType) - ARG 1 message ARG 2 playerMessageFactory COMMENT a function that takes the player to send the message to COMMENT and returns either the text to send to them or {@code null} COMMENT to indicate the message should not be sent to them - ARG 3 type - ARG 4 sender - ARG 5 instant - ARG 6 signature - METHOD method_43514 broadcast (Lnet/minecraft/class_2561;Lnet/minecraft/class_2556;)V + METHOD method_43514 broadcast (Lnet/minecraft/class_2561;Lnet/minecraft/class_5321;)V COMMENT Broadcasts a message to all players and the server console. COMMENT COMMENT @apiNote This is used to send general messages such as a death @@ -189,8 +182,3 @@ CLASS net/minecraft/class_3324 net/minecraft/server/PlayerManager COMMENT @see #broadcast(Text, Function, MessageType) COMMENT @see #broadcast(Text, Function, MessageType, ChatMessageSender, Instant, NetworkEncryptionUtils.SignatureData) ARG 1 message - ARG 2 type - METHOD method_43515 broadcast (Lnet/minecraft/class_2561;Lnet/minecraft/class_2556;Ljava/util/UUID;)V - ARG 1 message - ARG 2 type - ARG 3 uuid diff --git a/mappings/net/minecraft/server/command/MeCommand.mapping b/mappings/net/minecraft/server/command/MeCommand.mapping index 4600161708..a275caabe1 100644 --- a/mappings/net/minecraft/server/command/MeCommand.mapping +++ b/mappings/net/minecraft/server/command/MeCommand.mapping @@ -3,10 +3,3 @@ CLASS net/minecraft/class_3045 net/minecraft/server/command/MeCommand ARG 0 dispatcher METHOD method_13238 (Lcom/mojang/brigadier/context/CommandContext;)I ARG 0 context - METHOD method_31373 getEmoteText (Lcom/mojang/brigadier/context/CommandContext;Ljava/lang/String;)Lnet/minecraft/class_2561; - ARG 0 context - ARG 1 arg - METHOD method_31374 (Lnet/minecraft/class_3222;Lnet/minecraft/class_2561;Lnet/minecraft/class_2561;Lnet/minecraft/class_3222;)Lnet/minecraft/class_2561; - ARG 3 player - METHOD method_31375 (Lcom/mojang/brigadier/context/CommandContext;Lnet/minecraft/server/MinecraftServer;Lnet/minecraft/class_3222;Lnet/minecraft/class_5513$class_5837;)V - ARG 3 message diff --git a/mappings/net/minecraft/server/command/MessageCommand.mapping b/mappings/net/minecraft/server/command/MessageCommand.mapping index ac46679d37..eac54cf4fc 100644 --- a/mappings/net/minecraft/server/command/MessageCommand.mapping +++ b/mappings/net/minecraft/server/command/MessageCommand.mapping @@ -1,13 +1,8 @@ CLASS net/minecraft/class_3082 net/minecraft/server/command/MessageCommand METHOD method_13461 register (Lcom/mojang/brigadier/CommandDispatcher;)V ARG 0 dispatcher - METHOD method_13462 execute (Lnet/minecraft/class_2168;Ljava/util/Collection;Lnet/minecraft/class_2561;)I + METHOD method_13462 execute (Lnet/minecraft/class_2168;Ljava/util/Collection;Lnet/minecraft/class_7471;)I ARG 0 source ARG 1 targets - ARG 2 message METHOD method_13463 (Lcom/mojang/brigadier/context/CommandContext;)I ARG 0 context - METHOD method_31164 (Lnet/minecraft/class_3222;Lnet/minecraft/class_2561;Lnet/minecraft/class_2561;)V - ARG 2 playerName - METHOD method_31165 (Lnet/minecraft/class_2168;Lnet/minecraft/class_2561;Lnet/minecraft/class_2561;)V - ARG 2 playerName diff --git a/mappings/net/minecraft/server/command/ServerCommandSource.mapping b/mappings/net/minecraft/server/command/ServerCommandSource.mapping index 45c262bcaf..8163931139 100644 --- a/mappings/net/minecraft/server/command/ServerCommandSource.mapping +++ b/mappings/net/minecraft/server/command/ServerCommandSource.mapping @@ -27,7 +27,7 @@ CLASS net/minecraft/class_2168 net/minecraft/server/command/ServerCommandSource ARG 7 displayName ARG 8 server ARG 9 entity - METHOD (Lnet/minecraft/class_2165;Lnet/minecraft/class_243;Lnet/minecraft/class_241;Lnet/minecraft/class_3218;ILjava/lang/String;Lnet/minecraft/class_2561;Lnet/minecraft/server/MinecraftServer;Lnet/minecraft/class_1297;ZLcom/mojang/brigadier/ResultConsumer;Lnet/minecraft/class_2183$class_2184;)V + METHOD (Lnet/minecraft/class_2165;Lnet/minecraft/class_243;Lnet/minecraft/class_241;Lnet/minecraft/class_3218;ILjava/lang/String;Lnet/minecraft/class_2561;Lnet/minecraft/server/MinecraftServer;Lnet/minecraft/class_1297;ZLcom/mojang/brigadier/ResultConsumer;Lnet/minecraft/class_2183$class_2184;Lnet/minecraft/class_7448;)V ARG 1 output ARG 2 pos ARG 3 rot diff --git a/mappings/net/minecraft/server/command/TeamMsgCommand.mapping b/mappings/net/minecraft/server/command/TeamMsgCommand.mapping index a2ab04db9d..00e052e198 100644 --- a/mappings/net/minecraft/server/command/TeamMsgCommand.mapping +++ b/mappings/net/minecraft/server/command/TeamMsgCommand.mapping @@ -1,9 +1,7 @@ CLASS net/minecraft/class_3945 net/minecraft/server/command/TeamMsgCommand FIELD field_17440 NO_TEAM_EXCEPTION Lcom/mojang/brigadier/exceptions/SimpleCommandExceptionType; FIELD field_24380 STYLE Lnet/minecraft/class_2583; - METHOD method_17599 execute (Lnet/minecraft/class_2168;Lnet/minecraft/class_2561;)I - ARG 0 source - ARG 1 message + METHOD method_17599 execute (Lnet/minecraft/class_2168;Lnet/minecraft/class_7471;)I METHOD method_17600 register (Lcom/mojang/brigadier/CommandDispatcher;)V ARG 0 dispatcher METHOD method_17601 (Lcom/mojang/brigadier/context/CommandContext;)I diff --git a/mappings/net/minecraft/server/dedicated/MinecraftDedicatedServer.mapping b/mappings/net/minecraft/server/dedicated/MinecraftDedicatedServer.mapping index c5357fe962..693b1ef856 100644 --- a/mappings/net/minecraft/server/dedicated/MinecraftDedicatedServer.mapping +++ b/mappings/net/minecraft/server/dedicated/MinecraftDedicatedServer.mapping @@ -1,5 +1,4 @@ CLASS net/minecraft/class_3176 net/minecraft/server/dedicated/MinecraftDedicatedServer - FIELD field_13810 SHA1_PATTERN Ljava/util/regex/Pattern; FIELD field_13811 rconCommandOutput Lnet/minecraft/class_3350; FIELD field_13814 LOGGER Lorg/slf4j/Logger; FIELD field_13815 commandQueue Ljava/util/List; @@ -8,7 +7,6 @@ CLASS net/minecraft/class_3176 net/minecraft/server/dedicated/MinecraftDedicated FIELD field_16799 propertiesLoader Lnet/minecraft/class_3807; FIELD field_16800 gui Lnet/minecraft/class_3182; FIELD field_26898 filterer Lnet/minecraft/class_5514; - FIELD field_33431 resourcePackPrompt Lnet/minecraft/class_2561; METHOD (Ljava/lang/Thread;Lnet/minecraft/class_32$class_5143;Lnet/minecraft/class_3283;Lnet/minecraft/class_6904;Lnet/minecraft/class_3807;Lcom/mojang/datafixers/DataFixer;Lcom/mojang/authlib/minecraft/MinecraftSessionService;Lcom/mojang/authlib/GameProfileRepository;Lnet/minecraft/class_3312;Lnet/minecraft/class_3950;)V ARG 1 serverThread ARG 2 session @@ -27,7 +25,6 @@ CLASS net/minecraft/class_3176 net/minecraft/server/dedicated/MinecraftDedicated ARG 1 command ARG 2 commandSource METHOD method_13948 createGui ()V - METHOD method_13950 createResourcePackHash ()Ljava/lang/String; METHOD method_13951 convertData ()Z METHOD method_16710 (ILnet/minecraft/class_3806;)Lnet/minecraft/class_3806; ARG 2 serverPropertiesHandler @@ -35,5 +32,3 @@ CLASS net/minecraft/class_3176 net/minecraft/server/dedicated/MinecraftDedicated ARG 2 serverPropertiesHandler METHOD method_16712 setUseWhitelist (Z)V ARG 1 useWhitelist - METHOD method_36239 parseResourcePackPrompt (Lnet/minecraft/class_3807;)Lnet/minecraft/class_2561; - ARG 0 propertiesLoader diff --git a/mappings/net/minecraft/server/dedicated/ServerPropertiesHandler.mapping b/mappings/net/minecraft/server/dedicated/ServerPropertiesHandler.mapping index fa0ec3220f..6f372bf194 100644 --- a/mappings/net/minecraft/server/dedicated/ServerPropertiesHandler.mapping +++ b/mappings/net/minecraft/server/dedicated/ServerPropertiesHandler.mapping @@ -1,5 +1,4 @@ CLASS net/minecraft/class_3806 net/minecraft/server/dedicated/ServerPropertiesHandler - FIELD field_16801 resourcePack Ljava/lang/String; FIELD field_16802 broadcastConsoleToOps Z FIELD field_16804 whiteList Lnet/minecraft/class_3808$class_3809; FIELD field_16805 enforceWhitelist Z @@ -16,7 +15,6 @@ CLASS net/minecraft/class_3806 net/minecraft/server/dedicated/ServerPropertiesHa FIELD field_16818 enableRcon Z FIELD field_16819 enableQuery Z FIELD field_16820 levelName Ljava/lang/String; - FIELD field_16821 resourcePackSha1 Ljava/lang/String; FIELD field_16823 rconPassword Ljava/lang/String; FIELD field_16824 broadcastRconToOps Z FIELD field_16825 motd Ljava/lang/String; @@ -27,7 +25,6 @@ CLASS net/minecraft/class_3806 net/minecraft/server/dedicated/ServerPropertiesHa FIELD field_16831 queryPort I FIELD field_16832 useNativeTransport Z FIELD field_16833 pvp Z - FIELD field_16834 resourcePackHash Ljava/lang/String; FIELD field_16835 spawnMonsters Z FIELD field_16836 spawnAnimals Z FIELD field_16837 serverPort I @@ -46,8 +43,6 @@ CLASS net/minecraft/class_3806 net/minecraft/server/dedicated/ServerPropertiesHa FIELD field_24623 generatorOptions Lnet/minecraft/class_5285; FIELD field_25802 rateLimit I FIELD field_26899 textFilteringConfig Ljava/lang/String; - FIELD field_27845 requireResourcePack Z - FIELD field_33432 resourcePackPrompt Ljava/lang/String; FIELD field_34883 simulationDistance I FIELD field_35564 hideOnlinePlayers Z FIELD field_37039 worldGenProperties Lnet/minecraft/class_3806$class_7044; diff --git a/mappings/net/minecraft/server/network/ServerLoginNetworkHandler.mapping b/mappings/net/minecraft/server/network/ServerLoginNetworkHandler.mapping index eb16941dfe..2e8552d20f 100644 --- a/mappings/net/minecraft/server/network/ServerLoginNetworkHandler.mapping +++ b/mappings/net/minecraft/server/network/ServerLoginNetworkHandler.mapping @@ -32,7 +32,7 @@ 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 publicKeyInfo Lnet/minecraft/class_7428$class_7429; + FIELD field_39023 publicKeyInfo Lnet/minecraft/class_7428; METHOD (Lnet/minecraft/server/MinecraftServer;Lnet/minecraft/class_2535;)V ARG 1 server ARG 2 connection @@ -62,7 +62,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;Lcom/mojang/authlib/minecraft/MinecraftSessionService;Z)Lnet/minecraft/class_7428$class_7429; + METHOD method_43510 getVerifiedPublicKey (Lnet/minecraft/class_2915;Lcom/mojang/authlib/minecraft/MinecraftSessionService;Z)Lnet/minecraft/class_7428; ARG 0 packet ARG 1 minecraftSessionService ARG 2 shouldThrowOnMissingKey diff --git a/mappings/net/minecraft/server/network/ServerPlayNetworkHandler.mapping b/mappings/net/minecraft/server/network/ServerPlayNetworkHandler.mapping index 374264c4c5..2e901b86b6 100644 --- a/mappings/net/minecraft/server/network/ServerPlayNetworkHandler.mapping +++ b/mappings/net/minecraft/server/network/ServerPlayNetworkHandler.mapping @@ -56,8 +56,6 @@ CLASS net/minecraft/class_3244 net/minecraft/server/network/ServerPlayNetworkHan METHOD method_14369 sendPacket (Lnet/minecraft/class_2596;Lio/netty/util/concurrent/GenericFutureListener;)V ARG 1 packet ARG 2 listener - METHOD method_14370 executeCommand (Ljava/lang/String;)V - ARG 1 input METHOD method_14371 isMovementInvalid (DDDFF)Z COMMENT {@return whether this movement is invalid} COMMENT @@ -127,8 +125,6 @@ CLASS net/minecraft/class_3244 net/minecraft/server/network/ServerPlayNetworkHan ARG 3 book METHOD method_33797 (Ljava/util/function/UnaryOperator;Lnet/minecraft/class_5513$class_5837;)Lnet/minecraft/class_2519; ARG 1 message - METHOD method_33798 (Lnet/minecraft/class_2561;Lnet/minecraft/class_2561;Lnet/minecraft/class_3222;)Lnet/minecraft/class_2561; - ARG 3 player METHOD method_34882 clampHorizontal (D)D ARG 0 d METHOD method_34883 clampVertical (D)D diff --git a/mappings/net/minecraft/server/network/ServerPlayerEntity.mapping b/mappings/net/minecraft/server/network/ServerPlayerEntity.mapping index ee6205b0d3..d079485f87 100644 --- a/mappings/net/minecraft/server/network/ServerPlayerEntity.mapping +++ b/mappings/net/minecraft/server/network/ServerPlayerEntity.mapping @@ -48,7 +48,7 @@ CLASS net/minecraft/class_3222 net/minecraft/server/network/ServerPlayerEntity FIELD field_35007 fallStartPos Lnet/minecraft/class_243; FIELD field_35008 vehicleInLavaRidingPos Lnet/minecraft/class_243; FIELD field_35566 allowServerListing Z - 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_7428;)V ARG 1 server ARG 2 world ARG 3 profile @@ -200,8 +200,7 @@ CLASS net/minecraft/class_3222 net/minecraft/server/network/ServerPlayerEntity METHOD method_32749 writeGameModeNbt (Lnet/minecraft/class_2487;)V ARG 1 nbt METHOD method_33793 shouldFilterText ()Z - METHOD method_33794 acceptsMessage (Lnet/minecraft/class_2556;)Z - ARG 1 type + METHOD method_33794 acceptsMessage (Lnet/minecraft/class_5321;)Z METHOD method_33795 shouldFilterMessagesSentTo (Lnet/minecraft/class_3222;)Z ARG 1 player METHOD method_34225 onSpawn ()V @@ -211,23 +210,13 @@ CLASS net/minecraft/class_3222 net/minecraft/server/network/ServerPlayerEntity METHOD method_38786 tickFallStartPos ()V METHOD method_38787 tickVehicleInLavaRiding ()V METHOD method_39426 allowsServerListing ()Z - METHOD method_43501 sendMessage (Lnet/minecraft/class_2561;Ljava/util/UUID;)V - ARG 1 message - ARG 2 uuid - METHOD method_43502 sendMessage (Lnet/minecraft/class_2561;Lnet/minecraft/class_2556;)V + METHOD method_43502 sendMessage (Lnet/minecraft/class_2561;Lnet/minecraft/class_5321;)V COMMENT Sends a message to the player. COMMENT COMMENT @see #sendMessage(Text) COMMENT @see #sendChatMessage(Text, MessageType, ChatMessageSender, Instant, NetworkEncryptionUtils.SignatureData) ARG 1 message - ARG 2 type - METHOD method_43503 (Lnet/minecraft/class_2561;Lnet/minecraft/class_2556;Lio/netty/util/concurrent/Future;)V - ARG 3 future - METHOD method_43504 sendMessage (Lnet/minecraft/class_2561;Lnet/minecraft/class_2556;Ljava/util/UUID;)V - ARG 1 message - ARG 2 type - ARG 3 uuid - METHOD method_43505 sendChatMessage (Lnet/minecraft/class_2561;Lnet/minecraft/class_2556;Lnet/minecraft/class_7436;Ljava/time/Instant;Lnet/minecraft/class_3515$class_7425;)V + METHOD method_43505 sendChatMessage (Lnet/minecraft/class_7471;Lnet/minecraft/class_7436;Lnet/minecraft/class_5321;)V COMMENT Sends a chat message to the player. COMMENT COMMENT

Chat messages have signatures. It is possible to use a bogus signature - such as @@ -239,15 +228,9 @@ CLASS net/minecraft/class_3222 net/minecraft/server/network/ServerPlayerEntity COMMENT COMMENT @see #sendMessage(Text) COMMENT @see #sendMessage(Text, MessageType) + METHOD method_43506 sendMessageDeliverError (Lnet/minecraft/class_2561;Lnet/minecraft/class_5321;)V ARG 1 message - ARG 2 type - ARG 3 sender - ARG 4 instant - ARG 5 signature - METHOD method_43506 sendMessageDeliverError (Lnet/minecraft/class_2561;Lnet/minecraft/class_2556;)V - ARG 1 message - ARG 2 type - METHOD method_43507 (Lnet/minecraft/class_2561;Lnet/minecraft/class_2556;Lio/netty/util/concurrent/Future;)V + METHOD method_43507 (Lnet/minecraft/class_2561;Lnet/minecraft/class_5321;Lio/netty/util/concurrent/Future;)V ARG 3 future METHOD method_7336 changeGameMode (Lnet/minecraft/class_1934;)Z ARG 1 gameMode diff --git a/mappings/net/minecraft/world/event/listener/GameEventDispatcher.mapping b/mappings/net/minecraft/world/event/listener/GameEventDispatcher.mapping index 6f74dcf943..345ab64320 100644 --- a/mappings/net/minecraft/world/event/listener/GameEventDispatcher.mapping +++ b/mappings/net/minecraft/world/event/listener/GameEventDispatcher.mapping @@ -4,7 +4,7 @@ CLASS net/minecraft/class_5713 net/minecraft/world/event/listener/GameEventDispa COMMENT An unmodifiable, empty (non-operative) dispatcher. METHOD method_32942 isEmpty ()Z COMMENT Returns whether this dispatcher has no listeners. - METHOD method_32943 dispatch (Lnet/minecraft/class_5712;Lnet/minecraft/class_243;Lnet/minecraft/class_5712$class_7397;)V + METHOD method_32943 dispatch (Lnet/minecraft/class_5712;Lnet/minecraft/class_243;Lnet/minecraft/class_5712$class_7397;Ljava/util/function/BiConsumer;)Z COMMENT Dispatches an event to all the listeners in this dispatcher. ARG 1 event COMMENT the event diff --git a/mappings/net/minecraft/world/event/listener/GameEventListener.mapping b/mappings/net/minecraft/world/event/listener/GameEventListener.mapping index 9e615dc27f..1989f9ea53 100644 --- a/mappings/net/minecraft/world/event/listener/GameEventListener.mapping +++ b/mappings/net/minecraft/world/event/listener/GameEventListener.mapping @@ -2,13 +2,10 @@ CLASS net/minecraft/class_5714 net/minecraft/world/event/listener/GameEventListe COMMENT A game event listener listens to game events from {@link GameEventDispatcher}s. METHOD method_32946 getPositionSource ()Lnet/minecraft/class_5716; COMMENT Returns the position source of this listener. - METHOD method_32947 listen (Lnet/minecraft/class_3218;Lnet/minecraft/class_5712;Lnet/minecraft/class_5712$class_7397;Lnet/minecraft/class_243;)Z + METHOD method_32947 listen (Lnet/minecraft/class_3218;Lnet/minecraft/class_5712$class_7447;)Z COMMENT Listens to an incoming game event. COMMENT COMMENT @return {@code true} if the game event has been accepted by this listener ARG 1 world - ARG 2 event - ARG 3 emitter - ARG 4 pos METHOD method_32948 getRange ()I COMMENT Returns the range, in blocks, of the listener. diff --git a/mappings/net/minecraft/world/event/listener/SimpleGameEventDispatcher.mapping b/mappings/net/minecraft/world/event/listener/SimpleGameEventDispatcher.mapping index 26471f2700..9d3ed35261 100644 --- a/mappings/net/minecraft/world/event/listener/SimpleGameEventDispatcher.mapping +++ b/mappings/net/minecraft/world/event/listener/SimpleGameEventDispatcher.mapping @@ -10,9 +10,5 @@ CLASS net/minecraft/class_5711 net/minecraft/world/event/listener/SimpleGameEven FIELD field_37675 dispatching Z METHOD (Lnet/minecraft/class_3218;)V ARG 1 world - METHOD method_32936 dispatchTo (Lnet/minecraft/class_3218;Lnet/minecraft/class_5712;Lnet/minecraft/class_5712$class_7397;Lnet/minecraft/class_243;Lnet/minecraft/class_5714;)Z + METHOD method_32936 dispatchTo (Lnet/minecraft/class_3218;Lnet/minecraft/class_243;Lnet/minecraft/class_5714;)Ljava/util/Optional; ARG 0 world - ARG 1 event - ARG 2 emitter - ARG 3 pos - ARG 4 listener