From 290abdc6a22ba14a8f65aebf9bf131f310c3e4c7 Mon Sep 17 00:00:00 2001 From: apple502j <33279053+apple502j@users.noreply.github.com> Date: Wed, 23 Mar 2022 19:37:29 +0900 Subject: [PATCH] 22w11a client (#3049) * 22w11a font * 22w11a sound stuff * 22w11a options * 22w11a macOS icon stuff * 22w11a gl timer * 22w11a pending update/desync fix * 22w11a MC-235964 fix * 22w11a screen * 22w11a particle * 22w11a realms * 22w11a client util * 22w11a more sequence stuff * 22w11a misc client stuff * Add newline --- .../minecraft/client/MinecraftClient.mapping | 7 ++ .../client/font/BuiltinEmptyGlyph.mapping | 18 +++++ .../minecraft/client/font/FontManager.mapping | 2 + .../minecraft/client/font/FontStorage.mapping | 15 ++-- .../net/minecraft/client/font/Glyph.mapping | 2 + .../client/font/RenderableGlyph.mapping | 2 + .../minecraft/client/font/SpaceFont.mapping | 12 +++ .../client/font/TrueTypeFont.mapping | 3 + .../net/minecraft/client/gl/GlTimer.mapping | 18 +++++ .../client/gui/hud/BossBarHud.mapping | 7 ++ .../minecraft/client/gui/hud/ChatHud.mapping | 1 + .../screen/CustomizeBuffetLevelScreen.mapping | 5 ++ .../client/gui/screen/MessageScreen.mapping | 1 + .../gui/screen/OutOfMemoryScreen.mapping | 1 + .../client/gui/screen/PresetsScreen.mapping | 6 ++ .../client/gui/screen/SaveLevelScreen.mapping | 1 - .../client/gui/screen/Screen.mapping | 1 + .../option/AccessibilityOptionsScreen.mapping | 2 + .../screen/option/MouseOptionsScreen.mapping | 2 + .../gui/screen/option/OptionsScreen.mapping | 3 + .../screen/option/SoundOptionsScreen.mapping | 1 + .../screen/option/VideoOptionsScreen.mapping | 8 ++ .../screen/world/CreateWorldScreen.mapping | 30 +++++++ .../screen/world/LevelScreenProvider.mapping | 20 +++++ .../screen/world/MoreOptionsDialog.mapping | 45 +++++++++-- .../gui/widget/CyclingButtonWidget.mapping | 2 + .../widget/DoubleOptionSliderWidget.mapping | 1 + .../network/ClientPlayNetworkHandler.mapping | 4 + .../ClientPlayerInteractionManager.mapping | 23 ++++++ .../network/PendingUpdateManager.mapping | 32 ++++++++ .../network/SequencedPacketCreator.mapping | 3 + .../client/option/DoubleOption.mapping | 4 + .../client/option/GameOptions.mapping | 76 +++++++++++++++++ .../client/option/HotbarStorage.mapping | 1 + .../minecraft/client/option/Option.mapping | 17 ++++ .../client/option/SimpleOption.mapping | 81 +++++++++++++++++++ .../particle/SculkChargeParticle.mapping | 2 + .../particle/SculkChargePopParticle.mapping | 2 + .../client/particle/SoulParticle.mapping | 4 + .../gui/screen/RealmsMainScreen.mapping | 3 + .../client/sound/SoundEngine.mapping | 2 + .../client/util/MacWindowUtil.mapping | 2 + .../client/util/ParticleUtil.mapping | 2 + .../net/minecraft/client/util/PngFile.mapping | 1 + .../client/world/ClientWorld.mapping | 15 ++++ .../client/world/ScreenProvider.mapping | 3 - .../c2s/play/PlayerActionC2SPacket.mapping | 7 ++ .../play/PlayerInteractBlockC2SPacket.mapping | 3 + .../play/PlayerInteractItemC2SPacket.mapping | 3 + .../minecraft/server/MinecraftServer.mapping | 1 + .../network/ServerPlayNetworkHandler.mapping | 4 + .../ServerPlayerInteractionManager.mapping | 9 +++ .../net/minecraft/util/Identifier.mapping | 3 + .../util/profiler/DebugRecorder.mapping | 2 + .../minecraft/util/profiler/Recorder.mapping | 1 + 55 files changed, 512 insertions(+), 14 deletions(-) create mode 100644 mappings/net/minecraft/client/font/BuiltinEmptyGlyph.mapping create mode 100644 mappings/net/minecraft/client/font/SpaceFont.mapping create mode 100644 mappings/net/minecraft/client/gl/GlTimer.mapping create mode 100644 mappings/net/minecraft/client/gui/screen/MessageScreen.mapping delete mode 100644 mappings/net/minecraft/client/gui/screen/SaveLevelScreen.mapping create mode 100644 mappings/net/minecraft/client/gui/screen/world/LevelScreenProvider.mapping create mode 100644 mappings/net/minecraft/client/network/PendingUpdateManager.mapping create mode 100644 mappings/net/minecraft/client/network/SequencedPacketCreator.mapping create mode 100644 mappings/net/minecraft/client/option/SimpleOption.mapping delete mode 100644 mappings/net/minecraft/client/world/ScreenProvider.mapping diff --git a/mappings/net/minecraft/client/MinecraftClient.mapping b/mappings/net/minecraft/client/MinecraftClient.mapping index 02f2bf30cb..0323191e92 100644 --- a/mappings/net/minecraft/client/MinecraftClient.mapping +++ b/mappings/net/minecraft/client/MinecraftClient.mapping @@ -169,6 +169,9 @@ CLASS net/minecraft/class_310 net/minecraft/client/MinecraftClient FIELD field_34956 deviceSessionId Ljava/util/UUID; FIELD field_36433 REGIONAL_COMPLIANCIES_ID Lnet/minecraft/class_2960; FIELD field_36434 regionalComplianciesManager Lnet/minecraft/class_6877; + FIELD field_37855 metricsSampleDuration J + FIELD field_37856 gpuUtilizationPercentage D + FIELD field_37857 currentGlTimerQuery Lnet/minecraft/class_7168$class_7169; METHOD (Lnet/minecraft/class_542;)V ARG 1 args METHOD method_1476 checkIs64Bit ()Z @@ -460,6 +463,10 @@ CLASS net/minecraft/class_310 net/minecraft/client/MinecraftClient METHOD method_38932 loadBlockList ()V METHOD method_40189 isCountrySetTo (Ljava/lang/Object;)Z ARG 0 country + METHOD method_41731 (Lnet/minecraft/class_7168;)V + ARG 1 glTimer + METHOD method_41733 forceStopRecorder ()V + METHOD method_41734 getGpuUtilizationPercentage ()D CLASS class_5859 ChatRestriction COMMENT Represents the restrictions on chat on a Minecraft client. COMMENT diff --git a/mappings/net/minecraft/client/font/BuiltinEmptyGlyph.mapping b/mappings/net/minecraft/client/font/BuiltinEmptyGlyph.mapping new file mode 100644 index 0000000000..eeba64974f --- /dev/null +++ b/mappings/net/minecraft/client/font/BuiltinEmptyGlyph.mapping @@ -0,0 +1,18 @@ +CLASS net/minecraft/class_7191 net/minecraft/client/font/BuiltinEmptyGlyph + FIELD field_37900 image Lnet/minecraft/class_1011; + METHOD (Ljava/lang/String;ILjava/util/function/Supplier;)V + ARG 3 imageSupplier + METHOD method_41833 (II)I + ARG 0 x + ARG 1 y + METHOD method_41834 createRectImage (IILnet/minecraft/class_7191$class_7192;)Lnet/minecraft/class_1011; + ARG 0 width + ARG 1 height + ARG 2 colorSupplier + METHOD method_41835 (II)I + ARG 0 x + ARG 1 y + CLASS class_7192 ColorSupplier + METHOD getColor (II)I + ARG 1 x + ARG 2 y diff --git a/mappings/net/minecraft/client/font/FontManager.mapping b/mappings/net/minecraft/client/font/FontManager.mapping index 8cdf71f68e..5ae1f96775 100644 --- a/mappings/net/minecraft/client/font/FontManager.mapping +++ b/mappings/net/minecraft/client/font/FontManager.mapping @@ -18,6 +18,8 @@ CLASS net/minecraft/class_378 net/minecraft/client/font/FontManager METHOD method_27542 (Lnet/minecraft/class_2960;)Lnet/minecraft/class_377; ARG 1 id CLASS 1 + METHOD method_18633 (Lnet/minecraft/class_2960;)Z + ARG 0 id METHOD method_18637 (Lnet/minecraft/class_2960;)Ljava/util/List; ARG 0 id METHOD method_27543 (Ljava/util/List;I)V diff --git a/mappings/net/minecraft/client/font/FontStorage.mapping b/mappings/net/minecraft/client/font/FontStorage.mapping index 6ffe3397a1..7d0d1f8b27 100644 --- a/mappings/net/minecraft/client/font/FontStorage.mapping +++ b/mappings/net/minecraft/client/font/FontStorage.mapping @@ -16,6 +16,9 @@ CLASS net/minecraft/class_377 net/minecraft/client/font/FontStorage ARG 1 fonts METHOD method_2010 closeGlyphAtlases ()V METHOD method_2011 getGlyph (I)Lnet/minecraft/class_379; + COMMENT {@return the glyph of {@code codePoint}} + COMMENT + COMMENT @implNote {@link BuiltinEmptyGlyph#MISSING} is returned for missing code points. ARG 1 codePoint METHOD method_2012 getGlyphRenderer (Lnet/minecraft/class_383;)Lnet/minecraft/class_382; ARG 1 c @@ -27,10 +30,12 @@ CLASS net/minecraft/class_377 net/minecraft/client/font/FontStorage METHOD method_24290 closeFonts ()V METHOD method_27545 (Ljava/util/List;Ljava/util/Set;I)V ARG 3 codePoint - METHOD method_40038 getEmptyGlyph (I)Lnet/minecraft/class_379; - COMMENT {@return the pre-defined empty glyph for the code point, or - COMMENT {@code null} if it is not defined} + METHOD method_27546 (I)Lit/unimi/dsi/fastutil/ints/IntList; + ARG 0 advance + METHOD method_40038 findGlyph (I)Lnet/minecraft/class_379; + COMMENT {@return the glyph of {@code codePoint}} COMMENT - COMMENT @implNote Pre-defined empty glyphs include the space ({@code U+0020}) - COMMENT and zero-width non joiner ({@code U+200C}). + COMMENT @apiNote Call {@link #getGlyph} instead, as that method provides caching. + ARG 1 codePoint + METHOD method_41832 findGlyphRenderer (I)Lnet/minecraft/class_382; ARG 1 codePoint diff --git a/mappings/net/minecraft/client/font/Glyph.mapping b/mappings/net/minecraft/client/font/Glyph.mapping index c095cd184e..089de053e4 100644 --- a/mappings/net/minecraft/client/font/Glyph.mapping +++ b/mappings/net/minecraft/client/font/Glyph.mapping @@ -1,4 +1,6 @@ CLASS net/minecraft/class_379 net/minecraft/client/font/Glyph + METHOD bake (Ljava/util/function/Function;)Lnet/minecraft/class_382; + ARG 1 glyphRendererGetter METHOD method_16798 getAdvance (Z)F ARG 1 bold METHOD method_16799 getBoldOffset ()F diff --git a/mappings/net/minecraft/client/font/RenderableGlyph.mapping b/mappings/net/minecraft/client/font/RenderableGlyph.mapping index f6bf68dc03..aee6d12ee8 100644 --- a/mappings/net/minecraft/client/font/RenderableGlyph.mapping +++ b/mappings/net/minecraft/client/font/RenderableGlyph.mapping @@ -10,3 +10,5 @@ CLASS net/minecraft/class_383 net/minecraft/client/font/RenderableGlyph METHOD method_2033 hasColor ()Z METHOD method_2034 getXMin ()F METHOD method_2035 getOversample ()F + METHOD method_41712 getBearingX ()F + METHOD method_41713 getAscent ()F diff --git a/mappings/net/minecraft/client/font/SpaceFont.mapping b/mappings/net/minecraft/client/font/SpaceFont.mapping new file mode 100644 index 0000000000..7c51bc8be3 --- /dev/null +++ b/mappings/net/minecraft/client/font/SpaceFont.mapping @@ -0,0 +1,12 @@ +CLASS net/minecraft/class_7166 net/minecraft/client/font/SpaceFont + FIELD field_37841 EMPTY_GLYPH_RENDERER Lnet/minecraft/class_384; + FIELD field_37842 codePointsToGlyphs Lit/unimi/dsi/fastutil/ints/Int2ObjectMap; + METHOD (Lit/unimi/dsi/fastutil/ints/Int2FloatMap;)V + ARG 1 codePointsToAdvances + METHOD method_41715 fromJson (Lcom/google/gson/JsonObject;)Lnet/minecraft/class_389; + ARG 0 json + METHOD method_41716 (Lit/unimi/dsi/fastutil/ints/Int2FloatMap$Entry;)V + ARG 1 entry + METHOD method_41717 (Lit/unimi/dsi/fastutil/ints/Int2FloatMap;Lnet/minecraft/class_3300;)Lnet/minecraft/class_390; + ARG 0 manager + CLASS class_7167 EmptyGlyph diff --git a/mappings/net/minecraft/client/font/TrueTypeFont.mapping b/mappings/net/minecraft/client/font/TrueTypeFont.mapping index 5309fa70e7..bd6fa034d7 100644 --- a/mappings/net/minecraft/client/font/TrueTypeFont.mapping +++ b/mappings/net/minecraft/client/font/TrueTypeFont.mapping @@ -10,7 +10,10 @@ CLASS net/minecraft/class_395 net/minecraft/client/font/TrueTypeFont METHOD (Ljava/nio/ByteBuffer;Lorg/lwjgl/stb/STBTTFontinfo;FFFFLjava/lang/String;)V ARG 1 buffer ARG 2 info + ARG 3 size ARG 4 oversample + ARG 5 shiftX + ARG 6 shiftY ARG 7 excludedCharacters METHOD method_27443 (I)Z ARG 1 codePoint diff --git a/mappings/net/minecraft/client/gl/GlTimer.mapping b/mappings/net/minecraft/client/gl/GlTimer.mapping new file mode 100644 index 0000000000..16b0aab34f --- /dev/null +++ b/mappings/net/minecraft/client/gl/GlTimer.mapping @@ -0,0 +1,18 @@ +CLASS net/minecraft/class_7168 net/minecraft/client/gl/GlTimer + FIELD field_37844 queryId I + METHOD method_41719 getInstance ()Ljava/util/Optional; + METHOD method_41720 beginProfile ()V + METHOD method_41721 endProfile ()Lnet/minecraft/class_7168$class_7169; + CLASS class_7169 Query + FIELD field_37845 MISSING J + FIELD field_37846 CLOSED J + FIELD field_37847 queryId I + FIELD field_37848 result J + METHOD (I)V + ARG 1 queryId + METHOD method_41722 close ()V + METHOD method_41723 isResultAvailable ()Z + METHOD method_41724 queryResult ()J + CLASS class_7170 InstanceHolder + FIELD field_37849 INSTANCE Ljava/util/Optional; + METHOD method_41725 create ()Lnet/minecraft/class_7168; diff --git a/mappings/net/minecraft/client/gui/hud/BossBarHud.mapping b/mappings/net/minecraft/client/gui/hud/BossBarHud.mapping index 93942a4ad8..5f8cf95578 100644 --- a/mappings/net/minecraft/client/gui/hud/BossBarHud.mapping +++ b/mappings/net/minecraft/client/gui/hud/BossBarHud.mapping @@ -20,3 +20,10 @@ CLASS net/minecraft/class_337 net/minecraft/client/gui/hud/BossBarHud ARG 4 bossBar METHOD method_1800 shouldThickenFog ()Z METHOD method_1801 clear ()V + METHOD method_41830 renderBossBar (Lnet/minecraft/class_4587;IILnet/minecraft/class_1259;II)V + ARG 1 matrices + ARG 2 x + ARG 3 y + ARG 4 bossBar + ARG 5 width + ARG 6 height diff --git a/mappings/net/minecraft/client/gui/hud/ChatHud.mapping b/mappings/net/minecraft/client/gui/hud/ChatHud.mapping index e7efe83521..64656c1fec 100644 --- a/mappings/net/minecraft/client/gui/hud/ChatHud.mapping +++ b/mappings/net/minecraft/client/gui/hud/ChatHud.mapping @@ -64,3 +64,4 @@ CLASS net/minecraft/class_338 net/minecraft/client/gui/hud/ChatHud ARG 1 message METHOD method_30885 (ILnet/minecraft/class_303;)Z ARG 1 message + METHOD method_41831 getDefaultUnfocusedHeight ()D diff --git a/mappings/net/minecraft/client/gui/screen/CustomizeBuffetLevelScreen.mapping b/mappings/net/minecraft/client/gui/screen/CustomizeBuffetLevelScreen.mapping index 3b51a147b3..e3d7879784 100644 --- a/mappings/net/minecraft/client/gui/screen/CustomizeBuffetLevelScreen.mapping +++ b/mappings/net/minecraft/client/gui/screen/CustomizeBuffetLevelScreen.mapping @@ -8,6 +8,7 @@ CLASS net/minecraft/class_415 net/minecraft/client/gui/screen/CustomizeBuffetLev FIELD field_26535 BUFFET_BIOME_TEXT Lnet/minecraft/class_2561; METHOD (Lnet/minecraft/class_437;Lnet/minecraft/class_7193;Ljava/util/function/Consumer;)V ARG 1 parent + ARG 2 generatorOptionsHolder ARG 3 onDone METHOD method_19801 (Lnet/minecraft/class_4185;)V ARG 1 button @@ -18,6 +19,8 @@ CLASS net/minecraft/class_415 net/minecraft/client/gui/screen/CustomizeBuffetLev ARG 1 entry CLASS class_4190 BuffetBiomesListWidget FIELD field_18736 screen Lnet/minecraft/class_415; + METHOD method_28060 (Lnet/minecraft/class_6880$class_6883;)Lnet/minecraft/class_415$class_4190$class_4191; + ARG 1 entry METHOD method_40075 (Lnet/minecraft/class_415$class_4190;Lnet/minecraft/class_350$class_351;)V ARG 1 entry METHOD method_40076 (Lnet/minecraft/class_415$class_4190$class_4191;)Ljava/lang/String; @@ -25,3 +28,5 @@ CLASS net/minecraft/class_415 net/minecraft/client/gui/screen/CustomizeBuffetLev CLASS class_4191 BuffetBiomeItem FIELD field_24564 biome Lnet/minecraft/class_6880$class_6883; FIELD field_26536 text Lnet/minecraft/class_2561; + METHOD (Lnet/minecraft/class_415$class_4190;Lnet/minecraft/class_6880$class_6883;)V + ARG 2 biome diff --git a/mappings/net/minecraft/client/gui/screen/MessageScreen.mapping b/mappings/net/minecraft/client/gui/screen/MessageScreen.mapping new file mode 100644 index 0000000000..326d3d68c7 --- /dev/null +++ b/mappings/net/minecraft/client/gui/screen/MessageScreen.mapping @@ -0,0 +1 @@ +CLASS net/minecraft/class_424 net/minecraft/client/gui/screen/MessageScreen diff --git a/mappings/net/minecraft/client/gui/screen/OutOfMemoryScreen.mapping b/mappings/net/minecraft/client/gui/screen/OutOfMemoryScreen.mapping index 060b049448..ecb4030edd 100644 --- a/mappings/net/minecraft/client/gui/screen/OutOfMemoryScreen.mapping +++ b/mappings/net/minecraft/client/gui/screen/OutOfMemoryScreen.mapping @@ -1,4 +1,5 @@ CLASS net/minecraft/class_428 net/minecraft/client/gui/screen/OutOfMemoryScreen + FIELD field_37907 message Lnet/minecraft/class_5489; METHOD method_19834 (Lnet/minecraft/class_4185;)V ARG 1 button METHOD method_19835 (Lnet/minecraft/class_4185;)V diff --git a/mappings/net/minecraft/client/gui/screen/PresetsScreen.mapping b/mappings/net/minecraft/client/gui/screen/PresetsScreen.mapping index e190b29d92..f79e1dfe99 100644 --- a/mappings/net/minecraft/client/gui/screen/PresetsScreen.mapping +++ b/mappings/net/minecraft/client/gui/screen/PresetsScreen.mapping @@ -15,6 +15,7 @@ CLASS net/minecraft/class_430 net/minecraft/client/gui/screen/PresetsScreen FIELD field_32267 ICON_BACKGROUND_OFFSET_Y I FIELD field_32268 ICON_OFFSET_X I FIELD field_32269 ICON_OFFSET_Y I + FIELD field_37908 UNKNOWN_PRESET_TEXT Lnet/minecraft/class_2561; METHOD (Lnet/minecraft/class_413;)V ARG 1 parent METHOD method_19846 (Lnet/minecraft/class_4185;)V @@ -37,8 +38,11 @@ CLASS net/minecraft/class_430 net/minecraft/client/gui/screen/PresetsScreen METHOD method_29062 getGeneratorConfigString (Lnet/minecraft/class_3232;)Ljava/lang/String; ARG 0 config CLASS class_4196 SuperflatPresetsListWidget + METHOD (Lnet/minecraft/class_430;Lnet/minecraft/class_5455;)V + ARG 2 dynamicRegistryManager CLASS class_432 SuperflatPresetEntry FIELD field_33812 preset Lnet/minecraft/class_7142; + FIELD field_37909 text Lnet/minecraft/class_2561; METHOD (Lnet/minecraft/class_430$class_4196;Lnet/minecraft/class_6880;)V ARG 2 preset METHOD method_19389 setPreset ()V @@ -51,3 +55,5 @@ CLASS net/minecraft/class_430 net/minecraft/client/gui/screen/PresetsScreen ARG 2 x ARG 3 y ARG 4 iconItem + METHOD method_41842 (Lnet/minecraft/class_5321;)Lnet/minecraft/class_2561; + ARG 0 key diff --git a/mappings/net/minecraft/client/gui/screen/SaveLevelScreen.mapping b/mappings/net/minecraft/client/gui/screen/SaveLevelScreen.mapping deleted file mode 100644 index da2446a10a..0000000000 --- a/mappings/net/minecraft/client/gui/screen/SaveLevelScreen.mapping +++ /dev/null @@ -1 +0,0 @@ -CLASS net/minecraft/class_424 net/minecraft/client/gui/screen/SaveLevelScreen diff --git a/mappings/net/minecraft/client/gui/screen/Screen.mapping b/mappings/net/minecraft/client/gui/screen/Screen.mapping index 4734344f29..1bf724af62 100644 --- a/mappings/net/minecraft/client/gui/screen/Screen.mapping +++ b/mappings/net/minecraft/client/gui/screen/Screen.mapping @@ -170,6 +170,7 @@ CLASS net/minecraft/class_437 net/minecraft/client/gui/screen/Screen METHOD method_37073 isNarratorActive ()Z METHOD method_40041 hide ([Lnet/minecraft/class_339;)V ARG 0 widgets + METHOD method_41843 clearAndInit ()V CLASS class_6390 SelectedElementNarrationData FIELD field_33825 selectable Lnet/minecraft/class_6379; FIELD field_33826 index I diff --git a/mappings/net/minecraft/client/gui/screen/option/AccessibilityOptionsScreen.mapping b/mappings/net/minecraft/client/gui/screen/option/AccessibilityOptionsScreen.mapping index 8a8a78902f..a8d5673c4d 100644 --- a/mappings/net/minecraft/client/gui/screen/option/AccessibilityOptionsScreen.mapping +++ b/mappings/net/minecraft/client/gui/screen/option/AccessibilityOptionsScreen.mapping @@ -9,3 +9,5 @@ CLASS net/minecraft/class_4189 net/minecraft/client/gui/screen/option/Accessibil ARG 1 button METHOD method_31386 (Z)V ARG 1 openInBrowser + METHOD method_41839 getOptions (Lnet/minecraft/class_315;)[Lnet/minecraft/class_316; + ARG 0 gameOptions diff --git a/mappings/net/minecraft/client/gui/screen/option/MouseOptionsScreen.mapping b/mappings/net/minecraft/client/gui/screen/option/MouseOptionsScreen.mapping index a7e380c450..00e37091b1 100644 --- a/mappings/net/minecraft/client/gui/screen/option/MouseOptionsScreen.mapping +++ b/mappings/net/minecraft/client/gui/screen/option/MouseOptionsScreen.mapping @@ -5,3 +5,5 @@ CLASS net/minecraft/class_4288 net/minecraft/client/gui/screen/option/MouseOptio ARG 2 gameOptions METHOD method_20411 (Lnet/minecraft/class_4185;)V ARG 1 button + METHOD method_41841 getOptons (Lnet/minecraft/class_315;)[Lnet/minecraft/class_316; + ARG 0 gameOptions diff --git a/mappings/net/minecraft/client/gui/screen/option/OptionsScreen.mapping b/mappings/net/minecraft/client/gui/screen/option/OptionsScreen.mapping index b1ca1362bc..78513741c5 100644 --- a/mappings/net/minecraft/client/gui/screen/option/OptionsScreen.mapping +++ b/mappings/net/minecraft/client/gui/screen/option/OptionsScreen.mapping @@ -37,4 +37,7 @@ CLASS net/minecraft/class_429 net/minecraft/client/gui/screen/option/OptionsScre ARG 3 translationKey ARG 4 client METHOD method_39487 (Lnet/minecraft/class_310;Lnet/minecraft/class_5676;Lnet/minecraft/class_1267;)V + ARG 1 button ARG 2 difficulty + METHOD method_39488 (Lnet/minecraft/class_4185;)V + ARG 1 button diff --git a/mappings/net/minecraft/client/gui/screen/option/SoundOptionsScreen.mapping b/mappings/net/minecraft/client/gui/screen/option/SoundOptionsScreen.mapping index 415087363d..a742c2fe81 100644 --- a/mappings/net/minecraft/client/gui/screen/option/SoundOptionsScreen.mapping +++ b/mappings/net/minecraft/client/gui/screen/option/SoundOptionsScreen.mapping @@ -1,4 +1,5 @@ CLASS net/minecraft/class_443 net/minecraft/client/gui/screen/option/SoundOptionsScreen + FIELD field_37910 directionalAudioButton Lnet/minecraft/class_339; METHOD (Lnet/minecraft/class_437;Lnet/minecraft/class_315;)V ARG 1 parent ARG 2 options diff --git a/mappings/net/minecraft/client/gui/screen/option/VideoOptionsScreen.mapping b/mappings/net/minecraft/client/gui/screen/option/VideoOptionsScreen.mapping index a061e97182..ea69418744 100644 --- a/mappings/net/minecraft/client/gui/screen/option/VideoOptionsScreen.mapping +++ b/mappings/net/minecraft/client/gui/screen/option/VideoOptionsScreen.mapping @@ -11,7 +11,15 @@ CLASS net/minecraft/class_446 net/minecraft/client/gui/screen/option/VideoOption METHOD (Lnet/minecraft/class_437;Lnet/minecraft/class_315;)V ARG 1 parent ARG 2 options + METHOD method_19865 (Lnet/minecraft/class_1041;Lnet/minecraft/class_4185;)V + ARG 2 button METHOD method_30052 (Lnet/minecraft/class_4185;)V ARG 1 button METHOD method_30053 (Lnet/minecraft/class_4185;)V ARG 1 button + METHOD method_41844 (Lnet/minecraft/class_313;Lnet/minecraft/class_1041;Ljava/lang/Integer;)V + ARG 2 value + METHOD method_41845 (Lnet/minecraft/class_313;Lnet/minecraft/class_2588;Ljava/lang/Integer;)Lnet/minecraft/class_2561; + ARG 2 value + METHOD method_41846 getOptions (Lnet/minecraft/class_315;)[Lnet/minecraft/class_316; + ARG 0 gameOptions diff --git a/mappings/net/minecraft/client/gui/screen/world/CreateWorldScreen.mapping b/mappings/net/minecraft/client/gui/screen/world/CreateWorldScreen.mapping index 922a753529..a72f06ade2 100644 --- a/mappings/net/minecraft/client/gui/screen/world/CreateWorldScreen.mapping +++ b/mappings/net/minecraft/client/gui/screen/world/CreateWorldScreen.mapping @@ -32,6 +32,7 @@ CLASS net/minecraft/class_525 net/minecraft/client/gui/screen/world/CreateWorldS FIELD field_3202 moreOptionsOpen Z FIELD field_3205 createLevelButton Lnet/minecraft/class_4185; FIELD field_32434 TEMP_DIR_PREFIX Ljava/lang/String; + FIELD field_37911 PREPARING_TEXT Lnet/minecraft/class_2561; METHOD (Lnet/minecraft/class_437;Lnet/minecraft/class_5359;Lnet/minecraft/class_5292;)V ARG 1 parent ARG 2 dataPackSettings @@ -86,6 +87,8 @@ CLASS net/minecraft/class_525 net/minecraft/client/gui/screen/world/CreateWorldS METHOD method_30296 getScannedPack ()Lcom/mojang/datafixers/util/Pair; METHOD method_30297 onCloseScreen ()V METHOD method_31130 create (Lnet/minecraft/class_310;Lnet/minecraft/class_437;)V + ARG 0 client + ARG 1 parent METHOD method_32667 (Lnet/minecraft/class_5676;)Lnet/minecraft/class_5250; ARG 0 button METHOD method_32668 (Lnet/minecraft/class_5676;Lnet/minecraft/class_1267;)V @@ -100,6 +103,8 @@ CLASS net/minecraft/class_525 net/minecraft/client/gui/screen/world/CreateWorldS METHOD method_32671 (Lnet/minecraft/class_5676;)Lnet/minecraft/class_5250; ARG 1 button METHOD method_32672 getDifficulty ()Lnet/minecraft/class_1267; + METHOD method_37088 (Lnet/minecraft/class_5359;Lnet/minecraft/class_7193;)V + ARG 2 generatorOptionsHolder METHOD method_37089 (Ljava/lang/Void;Ljava/lang/Throwable;)Ljava/lang/Object; ARG 1 v ARG 2 throwable @@ -114,6 +119,31 @@ CLASS net/minecraft/class_525 net/minecraft/client/gui/screen/world/CreateWorldS ARG 2 path METHOD method_40213 createLevelInfo (Z)Lnet/minecraft/class_1940; ARG 1 debugWorld + METHOD method_41847 startServer ()V + METHOD method_41848 createSession ()Ljava/util/Optional; + METHOD method_41849 createServerConfig (Lnet/minecraft/class_3283;Lnet/minecraft/class_5359;)Lnet/minecraft/class_7237$class_6906; + ARG 0 resourcePackManager + ARG 1 dataPackSettings + METHOD method_41850 (Lnet/minecraft/class_6860;Lnet/minecraft/class_5350;Lnet/minecraft/class_5455$class_6890;Lcom/mojang/datafixers/util/Pair;)Lnet/minecraft/class_7193; + ARG 0 resourceManager + ARG 1 dataPackContents + ARG 2 dynamicRegistryManager + ARG 3 pair + METHOD method_41851 (Lnet/minecraft/class_6860;Lnet/minecraft/class_5350;Lnet/minecraft/class_5455$class_6890;Lnet/minecraft/class_5285;)Lnet/minecraft/class_7193; + ARG 0 resourceManager + ARG 1 dataPackContents + ARG 2 dynamicRegistryManager + ARG 3 generatorOptions + METHOD method_41852 showMessage (Lnet/minecraft/class_310;Lnet/minecraft/class_2561;)V + ARG 0 client + ARG 1 text + METHOD method_41853 (Ljava/nio/file/Path;)Z + ARG 1 path + METHOD method_41854 (Lnet/minecraft/class_3300;Lnet/minecraft/class_5359;)Lcom/mojang/datafixers/util/Pair; + ARG 0 resourceManager + ARG 1 dataPackSettings + METHOD method_41855 (Ljava/nio/file/Path;Ljava/nio/file/Path;)V + ARG 2 path CLASS class_4539 Mode FIELD field_20628 translationSuffix Ljava/lang/String; FIELD field_20629 defaultGameMode Lnet/minecraft/class_1934; diff --git a/mappings/net/minecraft/client/gui/screen/world/LevelScreenProvider.mapping b/mappings/net/minecraft/client/gui/screen/world/LevelScreenProvider.mapping new file mode 100644 index 0000000000..38b0183216 --- /dev/null +++ b/mappings/net/minecraft/client/gui/screen/world/LevelScreenProvider.mapping @@ -0,0 +1,20 @@ +CLASS net/minecraft/class_5293 net/minecraft/client/gui/screen/world/LevelScreenProvider + FIELD field_37912 WORLD_PRESET_TO_SCREEN_PROVIDER Ljava/util/Map; + METHOD createEditScreen (Lnet/minecraft/class_525;Lnet/minecraft/class_7193;)Lnet/minecraft/class_437; + ARG 1 parent + ARG 2 generatorOptionsHolder + METHOD method_41856 createModifier (Lnet/minecraft/class_3232;)Lnet/minecraft/class_7193$class_7195; + ARG 0 config + METHOD method_41857 (Lnet/minecraft/class_3232;Lnet/minecraft/class_5455$class_6890;Lnet/minecraft/class_5285;)Lnet/minecraft/class_5285; + ARG 1 dynamicRegistryManager + ARG 2 generatorOptions + METHOD method_41858 (Lnet/minecraft/class_525;Lnet/minecraft/class_3232;)V + ARG 1 config + METHOD method_41861 createModifier (Lnet/minecraft/class_6880;)Lnet/minecraft/class_7193$class_7195; + ARG 0 biomeEntry + METHOD method_41862 (Lnet/minecraft/class_6880;Lnet/minecraft/class_5455$class_6890;Lnet/minecraft/class_5285;)Lnet/minecraft/class_5285; + ARG 1 dynamicRegistryManager + ARG 2 generatorOptions + METHOD method_41863 (Lnet/minecraft/class_525;Lnet/minecraft/class_7193;)Lnet/minecraft/class_437; + ARG 0 parent + ARG 1 generatorOptionsHolder diff --git a/mappings/net/minecraft/client/gui/screen/world/MoreOptionsDialog.mapping b/mappings/net/minecraft/client/gui/screen/world/MoreOptionsDialog.mapping index 084555950b..7c95367ddf 100644 --- a/mappings/net/minecraft/client/gui/screen/world/MoreOptionsDialog.mapping +++ b/mappings/net/minecraft/client/gui/screen/world/MoreOptionsDialog.mapping @@ -6,28 +6,31 @@ CLASS net/minecraft/class_5292 net/minecraft/client/gui/screen/world/MoreOptions FIELD field_24595 mapFeaturesButton Lnet/minecraft/class_5676; FIELD field_24596 mapTypeButton Lnet/minecraft/class_5676; FIELD field_24597 customizeTypeButton Lnet/minecraft/class_4185; - FIELD field_24598 generatorOptions Lnet/minecraft/class_7193; + FIELD field_24598 generatorOptionsHolder Lnet/minecraft/class_7193; FIELD field_24600 seed Ljava/util/OptionalLong; FIELD field_25046 LOGGER Lorg/slf4j/Logger; FIELD field_25047 CUSTOM_TEXT Lnet/minecraft/class_2561; FIELD field_25048 importSettingsButton Lnet/minecraft/class_4185; - FIELD field_25049 generatorType Ljava/util/Optional; + FIELD field_25049 presetEntry Ljava/util/Optional; FIELD field_26604 MAP_FEATURES_INFO_TEXT Lnet/minecraft/class_2561; FIELD field_28000 SELECT_SETTINGS_FILE_TEXT Lnet/minecraft/class_2561; FIELD field_28001 unchangeableMapTypeButton Lnet/minecraft/class_4185; FIELD field_35754 AMPLIFIED_INFO_TEXT Lnet/minecraft/class_2561; FIELD field_35755 amplifiedInfoText Lnet/minecraft/class_5489; METHOD (Lnet/minecraft/class_7193;Ljava/util/Optional;Ljava/util/OptionalLong;)V - ARG 1 registryManager + ARG 1 generatorOptionsHolder + ARG 2 presetKey + ARG 3 seed METHOD method_28085 isDebugWorld ()Z - METHOD method_28086 setGeneratorOptions (Lnet/minecraft/class_7193;)V + METHOD method_28086 setGeneratorOptionsHolder (Lnet/minecraft/class_7193;)V + ARG 1 generatorOptionsHolder METHOD method_28087 (Lnet/minecraft/class_310;Lnet/minecraft/class_525;Lnet/minecraft/class_4185;)V ARG 3 button METHOD method_28092 init (Lnet/minecraft/class_525;Lnet/minecraft/class_310;Lnet/minecraft/class_327;)V ARG 1 parent ARG 2 client ARG 3 textRenderer - METHOD method_28096 getGeneratorOptions (Z)Lnet/minecraft/class_7193; + METHOD method_28096 getGeneratorOptionsHolder (Z)Lnet/minecraft/class_7193; ARG 1 hardcore METHOD method_28100 (Ljava/lang/String;)V ARG 1 seedText @@ -36,6 +39,7 @@ CLASS net/minecraft/class_5292 net/minecraft/client/gui/screen/world/MoreOptions METHOD method_29071 (Lnet/minecraft/class_310;Lnet/minecraft/class_525;Lnet/minecraft/class_4185;)V ARG 3 button METHOD method_29073 importOptions (Lnet/minecraft/class_5285;)V + ARG 1 generatorOptions METHOD method_29700 getRegistryManager ()Lnet/minecraft/class_5455; METHOD method_30510 seedToString (Ljava/util/OptionalLong;)Ljava/lang/String; ARG 0 seed @@ -46,6 +50,7 @@ CLASS net/minecraft/class_5292 net/minecraft/client/gui/screen/world/MoreOptions ARG 2 bonusChest METHOD method_32679 (Lnet/minecraft/class_525;Lnet/minecraft/class_5676;Lnet/minecraft/class_6880;)V ARG 2 button + ARG 3 presetEntry METHOD method_32680 (Lnet/minecraft/class_5676;)Lnet/minecraft/class_5250; ARG 0 button METHOD method_32682 disableBonusItems ()V @@ -55,3 +60,33 @@ CLASS net/minecraft/class_5292 net/minecraft/client/gui/screen/world/MoreOptions METHOD method_37090 tickSeedTextField ()V METHOD method_39664 (Lnet/minecraft/class_5676;)Lnet/minecraft/class_5250; ARG 0 button + METHOD method_41867 (Lnet/minecraft/class_310;Lnet/minecraft/class_525;Lcom/mojang/serialization/Lifecycle;Lnet/minecraft/class_5285;)V + ARG 1 result + METHOD method_41868 apply (Lnet/minecraft/class_7193$class_7194;)V + ARG 1 modifier + METHOD method_41869 apply (Lnet/minecraft/class_7193$class_7195;)V + ARG 1 modifier + METHOD method_41870 createPresetEntry (Lnet/minecraft/class_7193;Ljava/util/Optional;)Ljava/util/Optional; + ARG 0 generatorOptionsHolder + ARG 1 presetKey + METHOD method_41871 (Lnet/minecraft/class_7193;Lnet/minecraft/class_5321;)Ljava/util/Optional; + ARG 1 key + METHOD method_41872 isAmplified (Lnet/minecraft/class_6880;)Z + ARG 0 presetEntry + METHOD method_41873 (Lnet/minecraft/class_6880;Lnet/minecraft/class_5285;)Lnet/minecraft/class_5285; + ARG 1 generatorOptions + METHOD method_41874 (Lnet/minecraft/class_6885$class_6888;)Ljava/util/List; + ARG 0 entryList + METHOD method_41876 collectPresets (Lnet/minecraft/class_2378;Lnet/minecraft/class_6862;)Ljava/util/Optional; + ARG 0 presetRegistry + ARG 1 tag + METHOD method_41877 (Ljava/util/List;)Z + ARG 0 entries + METHOD method_41878 (Lnet/minecraft/class_5321;)Lnet/minecraft/class_2561; + ARG 0 key + METHOD method_41879 (ZLjava/util/OptionalLong;Lnet/minecraft/class_5285;)Lnet/minecraft/class_5285; + ARG 2 generatorOptions + METHOD method_41882 getText (Lnet/minecraft/class_6880;)Lnet/minecraft/class_2561; + ARG 0 presetEntry + METHOD method_41883 (Lnet/minecraft/class_5321;)Z + ARG 0 key diff --git a/mappings/net/minecraft/client/gui/widget/CyclingButtonWidget.mapping b/mappings/net/minecraft/client/gui/widget/CyclingButtonWidget.mapping index 747330b595..b5bdb49870 100644 --- a/mappings/net/minecraft/client/gui/widget/CyclingButtonWidget.mapping +++ b/mappings/net/minecraft/client/gui/widget/CyclingButtonWidget.mapping @@ -121,6 +121,7 @@ CLASS net/minecraft/class_5676 net/minecraft/client/gui/widget/CyclingButtonWidg ARG 1 value METHOD method_32620 values (Ljava/util/Collection;)Lnet/minecraft/class_5676$class_5677; COMMENT Sets the option values for this button. + ARG 1 values METHOD method_32621 values (Ljava/util/List;Ljava/util/List;)Lnet/minecraft/class_5676$class_5677; COMMENT Sets the option values for this button. COMMENT @@ -167,6 +168,7 @@ CLASS net/minecraft/class_5676 net/minecraft/client/gui/widget/CyclingButtonWidg CLASS class_5680 Values METHOD method_32626 getCurrent ()Ljava/util/List; METHOD method_32627 of (Ljava/util/Collection;)Lnet/minecraft/class_5676$class_5680; + ARG 0 values METHOD method_32628 of (Ljava/util/function/BooleanSupplier;Ljava/util/List;Ljava/util/List;)Lnet/minecraft/class_5676$class_5680; ARG 0 alternativeToggle ARG 1 defaults diff --git a/mappings/net/minecraft/client/gui/widget/DoubleOptionSliderWidget.mapping b/mappings/net/minecraft/client/gui/widget/DoubleOptionSliderWidget.mapping index da832c63b4..1335ab19f3 100644 --- a/mappings/net/minecraft/client/gui/widget/DoubleOptionSliderWidget.mapping +++ b/mappings/net/minecraft/client/gui/widget/DoubleOptionSliderWidget.mapping @@ -8,3 +8,4 @@ CLASS net/minecraft/class_4040 net/minecraft/client/gui/widget/DoubleOptionSlide ARG 4 width ARG 5 height ARG 6 option + ARG 7 orderedTooltip diff --git a/mappings/net/minecraft/client/network/ClientPlayNetworkHandler.mapping b/mappings/net/minecraft/client/network/ClientPlayNetworkHandler.mapping index c2e337fe61..91edffa5bf 100644 --- a/mappings/net/minecraft/client/network/ClientPlayNetworkHandler.mapping +++ b/mappings/net/minecraft/client/network/ClientPlayNetworkHandler.mapping @@ -67,6 +67,8 @@ CLASS net/minecraft/class_634 net/minecraft/client/network/ClientPlayNetworkHand METHOD method_34007 (ILnet/minecraft/class_2338;Lnet/minecraft/class_2680;)V ARG 2 pos ARG 3 state + METHOD method_34008 (Lnet/minecraft/class_1297;Lcom/mojang/datafixers/util/Pair;)V + ARG 1 pair METHOD method_34009 (Lnet/minecraft/class_1703;Lnet/minecraft/class_1860;)V ARG 2 recipe METHOD method_34010 (Lnet/minecraft/class_268;Lnet/minecraft/class_5900$class_5902;)V @@ -102,6 +104,8 @@ CLASS net/minecraft/class_634 net/minecraft/client/network/ClientPlayNetworkHand ARG 3 data METHOD method_38544 unloadChunk (Lnet/minecraft/class_2666;)V ARG 1 packet + METHOD method_40215 (Lnet/minecraft/class_5455$class_6892;)V + ARG 0 entry METHOD method_40217 loadTags (Lnet/minecraft/class_5321;Lnet/minecraft/class_6864$class_5748;)V ARG 1 registryKey ARG 2 serialized diff --git a/mappings/net/minecraft/client/network/ClientPlayerInteractionManager.mapping b/mappings/net/minecraft/client/network/ClientPlayerInteractionManager.mapping index a8cec7f441..6c6d3940e7 100644 --- a/mappings/net/minecraft/client/network/ClientPlayerInteractionManager.mapping +++ b/mappings/net/minecraft/client/network/ClientPlayerInteractionManager.mapping @@ -18,6 +18,8 @@ CLASS net/minecraft/class_636 net/minecraft/client/network/ClientPlayerInteracti METHOD method_2895 hasRidingInventory ()Z METHOD method_2896 interactBlock (Lnet/minecraft/class_746;Lnet/minecraft/class_1268;Lnet/minecraft/class_3965;)Lnet/minecraft/class_1269; ARG 1 player + ARG 2 hand + ARG 3 hitResult METHOD method_2897 stopUsingItem (Lnet/minecraft/class_1657;)V ARG 1 player METHOD method_2899 breakBlock (Lnet/minecraft/class_2338;)Z @@ -55,6 +57,7 @@ CLASS net/minecraft/class_636 net/minecraft/client/network/ClientPlayerInteracti ARG 1 stack ARG 2 slotId METHOD method_2910 attackBlock (Lnet/minecraft/class_2338;Lnet/minecraft/class_2350;)Z + ARG 1 pos ARG 2 direction METHOD method_2911 syncSelectedSlot ()V METHOD method_2912 clickRecipe (ILnet/minecraft/class_1860;Z)V @@ -77,6 +80,7 @@ CLASS net/minecraft/class_636 net/minecraft/client/network/ClientPlayerInteracti ARG 2 target METHOD method_2919 interactItem (Lnet/minecraft/class_1657;Lnet/minecraft/class_1268;)Lnet/minecraft/class_1269; ARG 1 player + ARG 2 hand METHOD method_2920 getCurrentGameMode ()Lnet/minecraft/class_1934; METHOD method_2922 isCurrentlyBreaking (Lnet/minecraft/class_2338;)Z ARG 1 pos @@ -93,3 +97,22 @@ CLASS net/minecraft/class_636 net/minecraft/client/network/ClientPlayerInteracti METHOD method_32790 setGameModes (Lnet/minecraft/class_1934;Lnet/minecraft/class_1934;)V ARG 1 gameMode ARG 2 previousGameMode + METHOD method_41929 (Lnet/minecraft/class_1268;Lnet/minecraft/class_1657;Lorg/apache/commons/lang3/mutable/MutableObject;I)Lnet/minecraft/class_2596; + ARG 4 sequence + METHOD method_41930 (Lnet/minecraft/class_2680;Lnet/minecraft/class_2338;Lnet/minecraft/class_2350;I)Lnet/minecraft/class_2596; + ARG 4 sequence + METHOD method_41931 sendSequencedPacket (Lnet/minecraft/class_638;Lnet/minecraft/class_7204;)V + ARG 1 world + ARG 2 packetCreator + METHOD method_41932 (Lnet/minecraft/class_2338;Lnet/minecraft/class_2350;I)Lnet/minecraft/class_2596; + ARG 3 sequence + METHOD method_41933 (Lorg/apache/commons/lang3/mutable/MutableObject;Lnet/minecraft/class_746;Lnet/minecraft/class_1268;Lnet/minecraft/class_3965;I)Lnet/minecraft/class_2596; + ARG 5 sequence + METHOD method_41934 interactBlockInternal (Lnet/minecraft/class_746;Lnet/minecraft/class_1268;Lnet/minecraft/class_3965;)Lnet/minecraft/class_1269; + ARG 1 player + ARG 2 hand + ARG 3 hitResult + METHOD method_41935 (Lnet/minecraft/class_2338;Lnet/minecraft/class_2350;I)Lnet/minecraft/class_2596; + ARG 3 sequence + METHOD method_41936 (Lnet/minecraft/class_2338;Lnet/minecraft/class_2350;I)Lnet/minecraft/class_2596; + ARG 3 sequence diff --git a/mappings/net/minecraft/client/network/PendingUpdateManager.mapping b/mappings/net/minecraft/client/network/PendingUpdateManager.mapping new file mode 100644 index 0000000000..34401a3f9f --- /dev/null +++ b/mappings/net/minecraft/client/network/PendingUpdateManager.mapping @@ -0,0 +1,32 @@ +CLASS net/minecraft/class_7202 net/minecraft/client/network/PendingUpdateManager + FIELD field_37953 blockPosToPendingUpdate Lit/unimi/dsi/fastutil/longs/Long2ObjectOpenHashMap; + FIELD field_37954 sequence I + FIELD field_37955 pendingSequence Z + METHOD method_41937 incrementSequence ()Lnet/minecraft/class_7202; + METHOD method_41938 processPendingUpdates (ILnet/minecraft/class_638;)V + ARG 1 maxProcessableSequence + ARG 2 world + METHOD method_41939 (Lnet/minecraft/class_2680;Lnet/minecraft/class_746;Ljava/lang/Long;Lnet/minecraft/class_7202$class_7203;)Lnet/minecraft/class_7202$class_7203; + ARG 3 posLong + ARG 4 pendingUpdate + METHOD method_41940 hasPendingUpdate (Lnet/minecraft/class_2338;Lnet/minecraft/class_2680;)Z + ARG 1 pos + ARG 2 state + METHOD method_41941 addPendingUpdate (Lnet/minecraft/class_2338;Lnet/minecraft/class_2680;Lnet/minecraft/class_746;)V + ARG 1 pos + ARG 2 state + ARG 3 player + METHOD method_41942 getSequence ()I + METHOD method_41943 hasPendingSequence ()Z + CLASS class_7203 PendingUpdate + FIELD field_37956 playerPos Lnet/minecraft/class_243; + FIELD field_37957 sequence I + FIELD field_37958 blockState Lnet/minecraft/class_2680; + METHOD (ILnet/minecraft/class_2680;Lnet/minecraft/class_243;)V + ARG 1 sequence + ARG 2 blockState + ARG 3 playerPos + METHOD method_41944 withSequence (I)Lnet/minecraft/class_7202$class_7203; + ARG 1 sequence + METHOD method_41945 setBlockState (Lnet/minecraft/class_2680;)V + ARG 1 state diff --git a/mappings/net/minecraft/client/network/SequencedPacketCreator.mapping b/mappings/net/minecraft/client/network/SequencedPacketCreator.mapping new file mode 100644 index 0000000000..aed0eb16aa --- /dev/null +++ b/mappings/net/minecraft/client/network/SequencedPacketCreator.mapping @@ -0,0 +1,3 @@ +CLASS net/minecraft/class_7204 net/minecraft/client/network/SequencedPacketCreator + METHOD predict (I)Lnet/minecraft/class_2596; + ARG 1 sequence diff --git a/mappings/net/minecraft/client/option/DoubleOption.mapping b/mappings/net/minecraft/client/option/DoubleOption.mapping index d089988e1c..be76da0d60 100644 --- a/mappings/net/minecraft/client/option/DoubleOption.mapping +++ b/mappings/net/minecraft/client/option/DoubleOption.mapping @@ -42,6 +42,10 @@ CLASS net/minecraft/class_4067 net/minecraft/client/option/DoubleOption ARG 1 options METHOD method_41809 getPixelValueText (I)Lnet/minecraft/class_2561; ARG 1 value + METHOD method_41810 (Lnet/minecraft/class_310;)Lnet/minecraft/class_316$class_5679; + ARG 0 client + METHOD method_41811 (Ljava/lang/Double;)Ljava/util/List; + ARG 0 value METHOD method_41812 getGenericValueText (Lnet/minecraft/class_2561;)Lnet/minecraft/class_2561; ARG 1 value METHOD method_41813 getGenericValueText (I)Lnet/minecraft/class_2561; diff --git a/mappings/net/minecraft/client/option/GameOptions.mapping b/mappings/net/minecraft/client/option/GameOptions.mapping index 32f93da827..c7eaad0116 100644 --- a/mappings/net/minecraft/client/option/GameOptions.mapping +++ b/mappings/net/minecraft/client/option/GameOptions.mapping @@ -179,6 +179,7 @@ CLASS net/minecraft/class_315 net/minecraft/client/option/GameOptions FIELD field_32156 monochromeLogo Lnet/minecraft/class_7172; FIELD field_34783 soundDevice Ljava/lang/String; FIELD field_34784 serverViewDistance I + FIELD field_34785 EMPTY_STRING Ljava/lang/String; FIELD field_34786 hideLightningFlashes Lnet/minecraft/class_7172; FIELD field_34787 chunkBuilderMode Lnet/minecraft/class_7172; FIELD field_34959 simulationDistance I @@ -186,6 +187,11 @@ CLASS net/minecraft/class_315 net/minecraft/client/option/GameOptions FIELD field_35637 allowServerListing Z FIELD field_37208 skipRealms32BitWarning Z FIELD field_37877 directionalAudio Z + FIELD field_37878 DARK_MOJANG_STUDIOS_BACKGROUND_COLOR_TOOLTIP Lnet/minecraft/class_2561; + FIELD field_37879 HIDE_LIGHTNING_FLASHES_TOOLTIP Lnet/minecraft/class_2561; + FIELD field_37880 NONE_CHUNK_BUILDER_MODE_TOOLTIP Lnet/minecraft/class_2561; + FIELD field_37881 BY_PLAYER_CHUNK_BUILDER_MODE_TOOLTIP Lnet/minecraft/class_2561; + FIELD field_37882 NEARBY_CHUNK_BUILDER_MODE_TOOLTIP Lnet/minecraft/class_2561; METHOD (Lnet/minecraft/class_310;Ljava/io/File;)V ARG 1 client ARG 2 optionsFile @@ -245,6 +251,8 @@ CLASS net/minecraft/class_315 net/minecraft/client/option/GameOptions METHOD method_33667 (Lnet/minecraft/class_315$class_5823;Lnet/minecraft/class_3419;Ljava/lang/Float;)Ljava/lang/Float; ARG 1 category ARG 2 currentLevel + METHOD method_33668 (Lit/unimi/dsi/fastutil/objects/Object2FloatOpenHashMap;)V + ARG 0 map METHOD method_33671 parseList (Ljava/lang/String;)Ljava/util/List; ARG 0 content METHOD method_33672 loadCloudRenderMode (Ljava/lang/String;)Lnet/minecraft/class_4063; @@ -260,6 +268,74 @@ CLASS net/minecraft/class_315 net/minecraft/client/option/GameOptions METHOD method_38520 setServerViewDistance (I)V ARG 1 serverViewDistance METHOD method_38521 getViewDistance ()I + METHOD method_41772 getMonochromeLogo ()Lnet/minecraft/class_7172; + METHOD method_41773 toMouseWheelSensitivitySliderProgressValue (D)I + ARG 0 value + METHOD method_41774 (Lnet/minecraft/class_310;)Lnet/minecraft/class_316$class_5679; + ARG 0 client + METHOD method_41775 (Lnet/minecraft/class_310;Lnet/minecraft/class_6597;)Ljava/util/List; + ARG 1 value + METHOD method_41776 (Lnet/minecraft/class_6597;)V + ARG 0 value + METHOD method_41777 (Ljava/lang/Boolean;)V + ARG 0 value + METHOD method_41778 (Ljava/lang/Double;)V + ARG 0 value + METHOD method_41779 (Ljava/lang/Integer;)V + ARG 0 value + METHOD method_41780 (Ljava/util/List;Ljava/lang/Boolean;)Ljava/util/List; + ARG 1 value + METHOD method_41781 getPercentValueText (Lnet/minecraft/class_2561;D)Lnet/minecraft/class_2561; + ARG 0 prefix + ARG 1 value + METHOD method_41782 getGenericValueText (Lnet/minecraft/class_2561;I)Lnet/minecraft/class_2561; + ARG 0 prefix + ARG 1 value + METHOD method_41783 getGenericValueText (Lnet/minecraft/class_2561;Lnet/minecraft/class_2561;)Lnet/minecraft/class_2561; + ARG 0 prefix + ARG 1 value + METHOD method_41784 getHideLightningFlashes ()Lnet/minecraft/class_7172; + METHOD method_41785 (Lnet/minecraft/class_4060;)V + ARG 0 value + METHOD method_41786 (Lnet/minecraft/class_310;)Lnet/minecraft/class_316$class_5679; + ARG 0 client + METHOD method_41787 (Lnet/minecraft/class_6597;)Lnet/minecraft/class_2561; + ARG 0 value + METHOD method_41788 (Ljava/lang/Double;)Lnet/minecraft/class_2561; + ARG 1 value + METHOD method_41789 (Ljava/lang/Integer;)Lnet/minecraft/class_2561; + ARG 1 value + METHOD method_41790 (Ljava/util/List;Ljava/lang/Boolean;)Ljava/util/List; + ARG 1 value + METHOD method_41791 getPixelValueText (Lnet/minecraft/class_2561;I)Lnet/minecraft/class_2561; + ARG 0 prefix + ARG 1 value + METHOD method_41792 getAo ()Lnet/minecraft/class_7172; + METHOD method_41793 toMouseWheelSensitivityValue (I)D + ARG 0 value + METHOD method_41794 (Lnet/minecraft/class_4060;)Lnet/minecraft/class_2561; + ARG 0 aoMode + METHOD method_41795 (Lnet/minecraft/class_310;)Lnet/minecraft/class_316$class_5679; + ARG 0 client + METHOD method_41796 (Ljava/lang/Double;)V + ARG 0 value + METHOD method_41797 (Ljava/lang/Integer;)V + ARG 0 value + METHOD method_41798 getChunkBuilderMode ()Lnet/minecraft/class_7172; + METHOD method_41799 (Ljava/lang/Double;)Lnet/minecraft/class_2561; + ARG 1 value + METHOD method_41800 (Ljava/lang/Integer;)Lnet/minecraft/class_2561; + ARG 1 value + METHOD method_41801 getChatHeightUnfocused ()Lnet/minecraft/class_7172; + METHOD method_41802 (Ljava/lang/Double;)V + ARG 0 value + METHOD method_41803 getChatHeightFocused ()Lnet/minecraft/class_7172; + METHOD method_41804 (Ljava/lang/Double;)Lnet/minecraft/class_2561; + ARG 1 value + METHOD method_41805 getBiomeBlendRadius ()Lnet/minecraft/class_7172; + METHOD method_41806 getMouseWheelSensitivity ()Lnet/minecraft/class_7172; + METHOD method_41807 getRawMouseInput ()Lnet/minecraft/class_7172; + METHOD method_41808 getFov ()Lnet/minecraft/class_7172; CLASS 2 METHOD method_33676 find (Ljava/lang/String;)Ljava/lang/String; ARG 1 key diff --git a/mappings/net/minecraft/client/option/HotbarStorage.mapping b/mappings/net/minecraft/client/option/HotbarStorage.mapping index 2012155892..327f6bd855 100644 --- a/mappings/net/minecraft/client/option/HotbarStorage.mapping +++ b/mappings/net/minecraft/client/option/HotbarStorage.mapping @@ -4,6 +4,7 @@ CLASS net/minecraft/class_302 net/minecraft/client/option/HotbarStorage FIELD field_1646 file Ljava/io/File; FIELD field_1647 LOGGER Lorg/slf4j/Logger; FIELD field_1648 dataFixer Lcom/mojang/datafixers/DataFixer; + FIELD field_32135 STORAGE_ENTRY_COUNT I METHOD (Ljava/io/File;Lcom/mojang/datafixers/DataFixer;)V ARG 1 file ARG 2 dataFixer diff --git a/mappings/net/minecraft/client/option/Option.mapping b/mappings/net/minecraft/client/option/Option.mapping index ff7ed5a32a..7de1060154 100644 --- a/mappings/net/minecraft/client/option/Option.mapping +++ b/mappings/net/minecraft/client/option/Option.mapping @@ -394,6 +394,23 @@ CLASS net/minecraft/class_316 net/minecraft/client/option/Option ARG 0 gameOptions ARG 1 option ARG 2 allowServerListing + METHOD method_41736 emptyTooltipFactoryGetter ()Ljava/util/function/Function; + METHOD method_41737 (Lnet/minecraft/class_310;)Lnet/minecraft/class_316$class_5679; + ARG 0 client + METHOD method_41738 (Lnet/minecraft/class_310;Ljava/lang/Boolean;)Ljava/util/List; + ARG 1 value + METHOD method_41739 (Lnet/minecraft/class_310;Ljava/lang/Double;)Ljava/util/List; + ARG 1 value + METHOD method_41740 (Ljava/lang/Object;)Ljava/util/List; + ARG 0 value + METHOD method_41741 (Lnet/minecraft/class_310;Ljava/lang/Double;)Ljava/util/List; + ARG 1 value + METHOD method_41742 (Lnet/minecraft/class_310;)Lnet/minecraft/class_316$class_5679; + ARG 0 client + METHOD method_41743 (Lnet/minecraft/class_310;)Lnet/minecraft/class_316$class_5679; + ARG 0 client + METHOD method_41744 (Lnet/minecraft/class_310;)Lnet/minecraft/class_316$class_5679; + ARG 0 client METHOD method_41745 (Lnet/minecraft/class_315;)Ljava/lang/Boolean; ARG 0 gameOptions METHOD method_41746 (Lnet/minecraft/class_315;Lnet/minecraft/class_316;Ljava/lang/Boolean;)V diff --git a/mappings/net/minecraft/client/option/SimpleOption.mapping b/mappings/net/minecraft/client/option/SimpleOption.mapping new file mode 100644 index 0000000000..f1f080c884 --- /dev/null +++ b/mappings/net/minecraft/client/option/SimpleOption.mapping @@ -0,0 +1,81 @@ +CLASS net/minecraft/class_7172 net/minecraft/client/option/SimpleOption + FIELD field_37862 LOGGER Lorg/slf4j/Logger; + FIELD field_37863 tooltipFactoryGetter Ljava/util/function/Function; + FIELD field_37864 textGetter Ljava/util/function/Function; + FIELD field_37865 callbacks Lnet/minecraft/class_7172$class_7178; + FIELD field_37866 defaultValue Ljava/lang/Object; + FIELD field_37867 changeCallback Ljava/util/function/Consumer; + FIELD field_37868 value Ljava/lang/Object; + METHOD (Ljava/lang/String;Ljava/util/function/Function;Ljava/util/function/Function;Lnet/minecraft/class_7172$class_7178;Ljava/lang/Object;Ljava/util/function/Consumer;)V + ARG 1 key + ARG 2 tooltipFactoryGetter + ARG 3 textGetter + ARG 4 callbacks + ARG 5 defaultValue + ARG 6 changeCallback + METHOD method_41747 (Ljava/lang/Boolean;)Lnet/minecraft/class_2561; + ARG 0 value + METHOD method_41748 setValue (Ljava/lang/Object;)V + ARG 1 value + METHOD method_41749 ofBoolean (Ljava/lang/String;Ljava/util/function/Function;Z)Lnet/minecraft/class_7172; + ARG 0 key + ARG 1 tooltipFactoryGetter + ARG 2 defaultValue + METHOD method_41750 ofBoolean (Ljava/lang/String;Ljava/util/function/Function;ZLjava/util/function/Consumer;)Lnet/minecraft/class_7172; + ARG 0 key + ARG 1 tooltipFactoryGetter + ARG 2 defaultValue + ARG 3 changeCallback + METHOD method_41751 ofBoolean (Ljava/lang/String;ZLjava/util/function/Consumer;)Lnet/minecraft/class_7172; + ARG 0 key + ARG 1 defaultValue + ARG 2 changeCallback + METHOD method_41752 (Ljava/lang/Boolean;)V + ARG 0 value + METHOD method_41753 getValue ()Ljava/lang/Object; + METHOD method_41754 getCallbacks ()Lnet/minecraft/class_7172$class_7178; + CLASS class_7173 PotentialValuesBasedCallbacks + METHOD method_41755 (Lnet/minecraft/class_316$class_5679;IIILnet/minecraft/class_315;Lnet/minecraft/class_7172;)Lnet/minecraft/class_339; + ARG 6 option + METHOD method_41757 (Lnet/minecraft/class_7172;Lnet/minecraft/class_315;Lnet/minecraft/class_5676;Ljava/lang/Object;)V + ARG 2 button + ARG 3 value + CLASS class_7174 IntSliderCallbacks + METHOD method_41760 (Lnet/minecraft/class_315;IIILnet/minecraft/class_316$class_5679;Lnet/minecraft/class_7172;)Lnet/minecraft/class_339; + ARG 6 option + METHOD method_41762 withModifier (Ljava/util/function/IntFunction;Ljava/util/function/ToIntFunction;)Lnet/minecraft/class_7172$class_7176; + ARG 1 sliderProgressValueToValue + ARG 2 valueToSliderProgressValue + CLASS 1 + METHOD method_41766 (Lnet/minecraft/class_315;IIILnet/minecraft/class_316$class_5679;Lnet/minecraft/class_7172;)Lnet/minecraft/class_339; + ARG 6 option + CLASS class_7175 OptionSliderWidgetImpl + FIELD field_37872 option Lnet/minecraft/class_7172; + FIELD field_37873 callbacks Lnet/minecraft/class_7172$class_7176; + FIELD field_37874 tooltipFactory Lnet/minecraft/class_316$class_5679; + METHOD (Lnet/minecraft/class_315;IIIILnet/minecraft/class_7172;Lnet/minecraft/class_7172$class_7176;Lnet/minecraft/class_316$class_5679;)V + ARG 1 options + ARG 2 x + ARG 3 y + ARG 4 width + ARG 5 height + ARG 6 option + ARG 7 callbacks + ARG 8 tooltipFactory + CLASS class_7176 SliderCallbacks + METHOD method_41763 toValue (D)Ljava/lang/Object; + ARG 1 sliderProgress + METHOD method_41765 toSliderProgress (Ljava/lang/Object;)D + ARG 1 value + CLASS class_7177 DoubleSliderCallbacks + METHOD method_41769 (Lnet/minecraft/class_315;IIILnet/minecraft/class_316$class_5679;Lnet/minecraft/class_7172;)Lnet/minecraft/class_339; + ARG 6 option + CLASS class_7178 Callbacks + METHOD method_41756 getButtonCreator (Lnet/minecraft/class_316$class_5679;Lnet/minecraft/class_315;III)Ljava/util/function/Function; + ARG 1 tooltipFactory + ARG 2 gameOptions + ARG 3 x + ARG 4 y + ARG 5 width + METHOD method_41758 validate (Ljava/lang/Object;)Z + ARG 1 value diff --git a/mappings/net/minecraft/client/particle/SculkChargeParticle.mapping b/mappings/net/minecraft/client/particle/SculkChargeParticle.mapping index 9e5958808e..6d155c6005 100644 --- a/mappings/net/minecraft/client/particle/SculkChargeParticle.mapping +++ b/mappings/net/minecraft/client/particle/SculkChargeParticle.mapping @@ -10,3 +10,5 @@ CLASS net/minecraft/class_7206 net/minecraft/client/particle/SculkChargeParticle ARG 12 velocityZ ARG 14 spriteProvider CLASS class_7207 Factory + FIELD comp_620 spriteProvider Lnet/minecraft/class_4002; + METHOD comp_620 spriteProvider ()Lnet/minecraft/class_4002; diff --git a/mappings/net/minecraft/client/particle/SculkChargePopParticle.mapping b/mappings/net/minecraft/client/particle/SculkChargePopParticle.mapping index b1520758b4..051b860368 100644 --- a/mappings/net/minecraft/client/particle/SculkChargePopParticle.mapping +++ b/mappings/net/minecraft/client/particle/SculkChargePopParticle.mapping @@ -10,3 +10,5 @@ CLASS net/minecraft/class_7208 net/minecraft/client/particle/SculkChargePopParti ARG 12 velocityZ ARG 14 spriteProvider CLASS class_7209 Factory + FIELD comp_621 spriteProvider Lnet/minecraft/class_4002; + METHOD comp_621 spriteProvider ()Lnet/minecraft/class_4002; diff --git a/mappings/net/minecraft/client/particle/SoulParticle.mapping b/mappings/net/minecraft/client/particle/SoulParticle.mapping index 53c30f1c9f..08e76ff9f0 100644 --- a/mappings/net/minecraft/client/particle/SoulParticle.mapping +++ b/mappings/net/minecraft/client/particle/SoulParticle.mapping @@ -1,5 +1,6 @@ CLASS net/minecraft/class_4956 net/minecraft/client/particle/SoulParticle FIELD field_23091 spriteProvider Lnet/minecraft/class_4002; + FIELD field_37961 sculk Z METHOD (Lnet/minecraft/class_638;DDDDDDLnet/minecraft/class_4002;)V ARG 1 world ARG 2 x @@ -14,3 +15,6 @@ CLASS net/minecraft/class_4956 net/minecraft/client/particle/SoulParticle METHOD (Lnet/minecraft/class_4002;)V ARG 1 spriteProvider CLASS class_7210 SculkSoulFactory + FIELD field_37962 spriteProvider Lnet/minecraft/class_4002; + METHOD (Lnet/minecraft/class_4002;)V + ARG 1 spriteProvider diff --git a/mappings/net/minecraft/client/realms/gui/screen/RealmsMainScreen.mapping b/mappings/net/minecraft/client/realms/gui/screen/RealmsMainScreen.mapping index 5f9ea2cc5d..f78a31661a 100644 --- a/mappings/net/minecraft/client/realms/gui/screen/RealmsMainScreen.mapping +++ b/mappings/net/minecraft/client/realms/gui/screen/RealmsMainScreen.mapping @@ -80,6 +80,7 @@ CLASS net/minecraft/class_4325 net/minecraft/client/realms/gui/screen/RealmsMain FIELD field_26465 NEWS_TEXT Lnet/minecraft/class_2561; FIELD field_26466 popupText Lnet/minecraft/class_5489; FIELD field_33774 TRIAL_NARRATION Lnet/minecraft/class_2561; + FIELD field_33775 hasSelectionList Z FIELD field_33776 UNINITIALIZED_BUTTON_NARRATION Lnet/minecraft/class_2561; FIELD field_37267 lastPlayButtonClickTime J METHOD (Lnet/minecraft/class_437;)V @@ -204,6 +205,8 @@ CLASS net/minecraft/class_4325 net/minecraft/client/realms/gui/screen/RealmsMain ARG 0 id METHOD method_23765 loadImages (Lnet/minecraft/class_3300;)V ARG 0 manager + METHOD method_23766 (Lnet/minecraft/class_2960;)Z + ARG 0 filename METHOD method_24985 openPendingInvitesScreen (Lnet/minecraft/class_4185;)V ARG 1 button METHOD method_24987 drawExpiring (Lnet/minecraft/class_4587;IIIII)V diff --git a/mappings/net/minecraft/client/sound/SoundEngine.mapping b/mappings/net/minecraft/client/sound/SoundEngine.mapping index 5c69bd95d0..381050ca63 100644 --- a/mappings/net/minecraft/client/sound/SoundEngine.mapping +++ b/mappings/net/minecraft/client/sound/SoundEngine.mapping @@ -10,6 +10,7 @@ CLASS net/minecraft/class_4225 net/minecraft/client/sound/SoundEngine FIELD field_34947 deviceSpecifier Ljava/lang/String; METHOD method_19661 init (Ljava/lang/String;Z)V ARG 1 deviceSpecifier + ARG 2 directionalAudio METHOD method_19662 release (Lnet/minecraft/class_4224;)V ARG 1 source METHOD method_19663 createSource (Lnet/minecraft/class_4225$class_4105;)Lnet/minecraft/class_4224; @@ -27,6 +28,7 @@ CLASS net/minecraft/class_4225 net/minecraft/client/sound/SoundEngine METHOD method_38722 getCurrentDeviceName ()Ljava/lang/String; METHOD method_38723 updateDeviceSpecifier ()Z METHOD method_38724 isDeviceUnavailable ()Z + METHOD method_41711 tryEnableDirectionalAudio ()V CLASS class_4105 RunMode CLASS class_4226 SourceSetImpl FIELD field_18903 maxSourceCount I diff --git a/mappings/net/minecraft/client/util/MacWindowUtil.mapping b/mappings/net/minecraft/client/util/MacWindowUtil.mapping index 1edf7c0000..a309570a48 100644 --- a/mappings/net/minecraft/client/util/MacWindowUtil.mapping +++ b/mappings/net/minecraft/client/util/MacWindowUtil.mapping @@ -8,3 +8,5 @@ CLASS net/minecraft/class_6417 net/minecraft/client/util/MacWindowUtil ARG 0 handle METHOD method_37464 toggleFullscreen (Lca/weblite/objc/NSObject;)V ARG 0 handle + METHOD method_41718 setApplicationIconImage (Ljava/io/InputStream;)V + ARG 0 stream diff --git a/mappings/net/minecraft/client/util/ParticleUtil.mapping b/mappings/net/minecraft/client/util/ParticleUtil.mapping index 7527089cbd..e040b20453 100644 --- a/mappings/net/minecraft/client/util/ParticleUtil.mapping +++ b/mappings/net/minecraft/client/util/ParticleUtil.mapping @@ -5,6 +5,7 @@ CLASS net/minecraft/class_5945 net/minecraft/client/util/ParticleUtil ARG 2 direction ARG 3 effect ARG 4 velocity + ARG 5 offsetMultiplier METHOD method_34682 spawnParticle (Lnet/minecraft/class_1937;Lnet/minecraft/class_2338;Lnet/minecraft/class_2394;Lnet/minecraft/class_6017;)V ARG 0 world ARG 1 pos @@ -24,5 +25,6 @@ CLASS net/minecraft/class_5945 net/minecraft/client/util/ParticleUtil ARG 3 count ARG 4 direction ARG 5 velocity + ARG 6 offsetMultiplier METHOD method_41306 getRandomVelocity (Ljava/util/Random;)Lnet/minecraft/class_243; ARG 0 random diff --git a/mappings/net/minecraft/client/util/PngFile.mapping b/mappings/net/minecraft/client/util/PngFile.mapping index acaa42e4be..57cfd96431 100644 --- a/mappings/net/minecraft/client/util/PngFile.mapping +++ b/mappings/net/minecraft/client/util/PngFile.mapping @@ -2,6 +2,7 @@ CLASS net/minecraft/class_1050 net/minecraft/client/util/PngFile FIELD field_5226 height I FIELD field_5227 width I METHOD (Ljava/util/function/Supplier;Ljava/io/InputStream;)V + ARG 1 filenameSupplier ARG 2 in METHOD method_4542 createReader (Ljava/io/InputStream;)Lnet/minecraft/class_1050$class_1051; ARG 0 is diff --git a/mappings/net/minecraft/client/world/ClientWorld.mapping b/mappings/net/minecraft/client/world/ClientWorld.mapping index 36f99703e8..5bf98fc119 100644 --- a/mappings/net/minecraft/client/world/ClientWorld.mapping +++ b/mappings/net/minecraft/client/world/ClientWorld.mapping @@ -17,9 +17,13 @@ CLASS net/minecraft/class_638 net/minecraft/client/world/ClientWorld FIELD field_3727 networkHandler Lnet/minecraft/class_634; FIELD field_3729 client Lnet/minecraft/class_310; FIELD field_3733 scoreboard Lnet/minecraft/class_269; + FIELD field_37951 pendingUpdateManager Lnet/minecraft/class_7202; + FIELD field_37952 LOGGER Lorg/slf4j/Logger; METHOD (Lnet/minecraft/class_634;Lnet/minecraft/class_638$class_5271;Lnet/minecraft/class_5321;Lnet/minecraft/class_6880;IILjava/util/function/Supplier;Lnet/minecraft/class_761;ZJ)V + ARG 1 networkHandler ARG 2 properties ARG 3 registryRef + ARG 4 dimensionTypeEntry ARG 5 loadDistance ARG 6 simulationDistance ARG 7 profiler @@ -148,6 +152,17 @@ CLASS net/minecraft/class_638 net/minecraft/client/world/ClientWorld METHOD method_39849 markChunkRenderability (II)V ARG 1 chunkX ARG 2 chunkZ + METHOD method_41925 getPendingUpdateManager ()Lnet/minecraft/class_7202; + METHOD method_41926 processPendingUpdate (Lnet/minecraft/class_2338;Lnet/minecraft/class_2680;Lnet/minecraft/class_243;)V + ARG 1 pos + ARG 2 state + ARG 3 playerPos + METHOD method_41927 handlePlayerActionResponse (I)V + ARG 1 sequence + METHOD method_41928 handleBlockUpdate (Lnet/minecraft/class_2338;Lnet/minecraft/class_2680;I)V + ARG 1 pos + ARG 2 state + ARG 3 flags METHOD method_8435 setTimeOfDay (J)V ARG 1 timeOfDay METHOD method_8441 tick (Ljava/util/function/BooleanSupplier;)V diff --git a/mappings/net/minecraft/client/world/ScreenProvider.mapping b/mappings/net/minecraft/client/world/ScreenProvider.mapping deleted file mode 100644 index 80690383d6..0000000000 --- a/mappings/net/minecraft/client/world/ScreenProvider.mapping +++ /dev/null @@ -1,3 +0,0 @@ -CLASS net/minecraft/class_5293 net/minecraft/client/world/ScreenProvider - METHOD createEditScreen (Lnet/minecraft/class_525;Lnet/minecraft/class_7193;)Lnet/minecraft/class_437; - ARG 1 screen diff --git a/mappings/net/minecraft/network/packet/c2s/play/PlayerActionC2SPacket.mapping b/mappings/net/minecraft/network/packet/c2s/play/PlayerActionC2SPacket.mapping index 90eb093675..04691a412f 100644 --- a/mappings/net/minecraft/network/packet/c2s/play/PlayerActionC2SPacket.mapping +++ b/mappings/net/minecraft/network/packet/c2s/play/PlayerActionC2SPacket.mapping @@ -2,13 +2,20 @@ CLASS net/minecraft/class_2846 net/minecraft/network/packet/c2s/play/PlayerActio FIELD field_12965 direction Lnet/minecraft/class_2350; FIELD field_12966 action Lnet/minecraft/class_2846$class_2847; FIELD field_12967 pos Lnet/minecraft/class_2338; + FIELD field_38048 sequence I METHOD (Lnet/minecraft/class_2540;)V ARG 1 buf + METHOD (Lnet/minecraft/class_2846$class_2847;Lnet/minecraft/class_2338;Lnet/minecraft/class_2350;)V + ARG 1 action + ARG 2 pos + ARG 3 direction METHOD (Lnet/minecraft/class_2846$class_2847;Lnet/minecraft/class_2338;Lnet/minecraft/class_2350;I)V ARG 1 action ARG 2 pos ARG 3 direction + ARG 4 sequence METHOD method_12360 getDirection ()Lnet/minecraft/class_2350; METHOD method_12362 getPos ()Lnet/minecraft/class_2338; METHOD method_12363 getAction ()Lnet/minecraft/class_2846$class_2847; + METHOD method_42079 getSequence ()I CLASS class_2847 Action diff --git a/mappings/net/minecraft/network/packet/c2s/play/PlayerInteractBlockC2SPacket.mapping b/mappings/net/minecraft/network/packet/c2s/play/PlayerInteractBlockC2SPacket.mapping index fc1298e13f..98db4a13fd 100644 --- a/mappings/net/minecraft/network/packet/c2s/play/PlayerInteractBlockC2SPacket.mapping +++ b/mappings/net/minecraft/network/packet/c2s/play/PlayerInteractBlockC2SPacket.mapping @@ -1,10 +1,13 @@ CLASS net/minecraft/class_2885 net/minecraft/network/packet/c2s/play/PlayerInteractBlockC2SPacket FIELD field_13134 hand Lnet/minecraft/class_1268; FIELD field_17602 blockHitResult Lnet/minecraft/class_3965; + FIELD field_38049 sequence I METHOD (Lnet/minecraft/class_1268;Lnet/minecraft/class_3965;I)V ARG 1 hand ARG 2 blockHitResult + ARG 3 sequence METHOD (Lnet/minecraft/class_2540;)V ARG 1 buf METHOD method_12543 getBlockHitResult ()Lnet/minecraft/class_3965; METHOD method_12546 getHand ()Lnet/minecraft/class_1268; + METHOD method_42080 getSequence ()I diff --git a/mappings/net/minecraft/network/packet/c2s/play/PlayerInteractItemC2SPacket.mapping b/mappings/net/minecraft/network/packet/c2s/play/PlayerInteractItemC2SPacket.mapping index 4e02a868c9..5131f29768 100644 --- a/mappings/net/minecraft/network/packet/c2s/play/PlayerInteractItemC2SPacket.mapping +++ b/mappings/net/minecraft/network/packet/c2s/play/PlayerInteractItemC2SPacket.mapping @@ -1,7 +1,10 @@ CLASS net/minecraft/class_2886 net/minecraft/network/packet/c2s/play/PlayerInteractItemC2SPacket FIELD field_13136 hand Lnet/minecraft/class_1268; + FIELD field_38050 sequence I METHOD (Lnet/minecraft/class_1268;I)V ARG 1 hand + ARG 2 sequence METHOD (Lnet/minecraft/class_2540;)V ARG 1 buf METHOD method_12551 getHand ()Lnet/minecraft/class_1268; + METHOD method_42081 getSequence ()I diff --git a/mappings/net/minecraft/server/MinecraftServer.mapping b/mappings/net/minecraft/server/MinecraftServer.mapping index 98801e5a99..00cd7aaa62 100644 --- a/mappings/net/minecraft/server/MinecraftServer.mapping +++ b/mappings/net/minecraft/server/MinecraftServer.mapping @@ -437,6 +437,7 @@ CLASS net/minecraft/server/MinecraftServer METHOD method_40376 createCrashReport (Ljava/lang/Throwable;)Lnet/minecraft/class_128; ARG 0 throwable METHOD method_41239 getMaxChainedNeighborUpdates ()I + METHOD method_42062 forceStopRecorder ()V METHOD method_5387 isMainThread ()Z CLASS class_6414 DebugStart FIELD field_33980 time J diff --git a/mappings/net/minecraft/server/network/ServerPlayNetworkHandler.mapping b/mappings/net/minecraft/server/network/ServerPlayNetworkHandler.mapping index 214569222a..4d8ae18db8 100644 --- a/mappings/net/minecraft/server/network/ServerPlayNetworkHandler.mapping +++ b/mappings/net/minecraft/server/network/ServerPlayNetworkHandler.mapping @@ -32,6 +32,8 @@ CLASS net/minecraft/class_3244 net/minecraft/server/network/ServerPlayNetworkHan FIELD field_14147 topmostRiddenEntity Lnet/minecraft/class_1297; FIELD field_14148 server Lnet/minecraft/server/MinecraftServer; FIELD field_29778 KEEP_ALIVE_INTERVAL I + FIELD field_37280 MAX_BREAK_SQUARED_DISTANCE D + FIELD field_37282 sequence I METHOD (Lnet/minecraft/server/MinecraftServer;Lnet/minecraft/class_2535;Lnet/minecraft/class_3222;)V ARG 2 connection ARG 3 player @@ -129,6 +131,8 @@ CLASS net/minecraft/class_3244 net/minecraft/server/network/ServerPlayNetworkHan ARG 0 d METHOD method_34883 clampVertical (D)D ARG 0 d + METHOD method_41255 updateSequence (I)V + ARG 1 sequence CLASS 1 METHOD method_33897 processInteract (Lnet/minecraft/class_1268;Lnet/minecraft/class_3244$class_5860;)V ARG 1 hand diff --git a/mappings/net/minecraft/server/network/ServerPlayerInteractionManager.mapping b/mappings/net/minecraft/server/network/ServerPlayerInteractionManager.mapping index f14809e9c5..6a09d7288d 100644 --- a/mappings/net/minecraft/server/network/ServerPlayerInteractionManager.mapping +++ b/mappings/net/minecraft/server/network/ServerPlayerInteractionManager.mapping @@ -33,8 +33,10 @@ CLASS net/minecraft/class_3225 net/minecraft/server/network/ServerPlayerInteract ARG 5 hitResult METHOD method_14263 processBlockBreakingAction (Lnet/minecraft/class_2338;Lnet/minecraft/class_2846$class_2847;Lnet/minecraft/class_2350;II)V ARG 1 pos + ARG 2 action ARG 3 direction ARG 4 worldHeight + ARG 5 sequence METHOD method_14264 update ()V METHOD method_14266 tryBreakBlock (Lnet/minecraft/class_2338;)Z ARG 1 pos @@ -43,8 +45,10 @@ CLASS net/minecraft/class_3225 net/minecraft/server/network/ServerPlayerInteract METHOD method_21716 continueMining (Lnet/minecraft/class_2680;Lnet/minecraft/class_2338;I)F ARG 1 state ARG 2 pos + ARG 3 failedStartMiningTime METHOD method_21717 finishMining (Lnet/minecraft/class_2338;ILjava/lang/String;)V ARG 1 pos + ARG 2 sequence ARG 3 reason METHOD method_30118 changeGameMode (Lnet/minecraft/class_1934;)Z COMMENT Checks if current game mode is different to {@code gameMode}, and change it if so. @@ -52,3 +56,8 @@ CLASS net/minecraft/class_3225 net/minecraft/server/network/ServerPlayerInteract COMMENT @return whether the current game mode has been changed ARG 1 gameMode METHOD method_30119 getPreviousGameMode ()Lnet/minecraft/class_1934; + METHOD method_41250 (Lnet/minecraft/class_2338;ZILjava/lang/String;)V + ARG 1 pos + ARG 2 success + ARG 3 sequence + ARG 4 reason diff --git a/mappings/net/minecraft/util/Identifier.mapping b/mappings/net/minecraft/util/Identifier.mapping index 7a11b73178..6658dc2a13 100644 --- a/mappings/net/minecraft/util/Identifier.mapping +++ b/mappings/net/minecraft/util/Identifier.mapping @@ -52,6 +52,9 @@ CLASS net/minecraft/class_2960 net/minecraft/util/Identifier METHOD method_29186 validate (Ljava/lang/String;)Lcom/mojang/serialization/DataResult; ARG 0 id METHOD method_36181 toUnderscoreSeparatedString ()Ljava/lang/String; + METHOD method_42093 toTranslationKey (Ljava/lang/String;)Ljava/lang/String; + ARG 1 prefix + METHOD method_42094 toTranslationKey ()Ljava/lang/String; CLASS class_2961 Serializer METHOD deserialize (Lcom/google/gson/JsonElement;Ljava/lang/reflect/Type;Lcom/google/gson/JsonDeserializationContext;)Ljava/lang/Object; ARG 1 json diff --git a/mappings/net/minecraft/util/profiler/DebugRecorder.mapping b/mappings/net/minecraft/util/profiler/DebugRecorder.mapping index 35a6e2aae8..32fb950d09 100644 --- a/mappings/net/minecraft/util/profiler/DebugRecorder.mapping +++ b/mappings/net/minecraft/util/profiler/DebugRecorder.mapping @@ -35,3 +35,5 @@ CLASS net/minecraft/class_5961 net/minecraft/util/profiler/DebugRecorder ARG 3 dumper ARG 4 resultConsumer ARG 5 dumpConsumer + METHOD method_41319 forceStop (Ljava/util/Collection;)V + ARG 1 samplers diff --git a/mappings/net/minecraft/util/profiler/Recorder.mapping b/mappings/net/minecraft/util/profiler/Recorder.mapping index 49e48ec41f..6c4401b6f9 100644 --- a/mappings/net/minecraft/util/profiler/Recorder.mapping +++ b/mappings/net/minecraft/util/profiler/Recorder.mapping @@ -4,3 +4,4 @@ CLASS net/minecraft/class_5962 net/minecraft/util/profiler/Recorder METHOD method_34772 endTick ()V METHOD method_34773 isActive ()Z METHOD method_34774 getProfiler ()Lnet/minecraft/class_3695; + METHOD method_41320 forceStop ()V