From a5297f8ac0fe12ab70ef83405c62af8c8e6f8049 Mon Sep 17 00:00:00 2001 From: Matias Koivikko Date: Thu, 29 Feb 2024 09:45:15 +0200 Subject: [PATCH] Misc screen and gui changes (#3802) --- .../block/dispenser/DispenserBehavior.mapping | 34 ++++++++-------- .../minecraft/client/MinecraftClient.mapping | 2 +- .../client/gl/PostEffectProcessor.mapping | 3 ++ .../gui/RotatingCubeMapRenderer.mapping | 2 + .../gui/screen/OutOfMemoryScreen.mapping | 3 ++ .../client/gui/screen/Screen.mapping | 23 +++++++++++ .../client/gui/screen/StatsScreen.mapping | 8 ++-- .../advancement/AdvancementsScreen.mapping | 5 +++ .../gui/screen/ingame/BeaconScreen.mapping | 14 +++---- .../MultiplayerServerListWidget.mapping | 2 +- .../SocialInteractionsScreen.mapping | 5 +++ .../screen/option/GameOptionsScreen.mapping | 3 ++ .../screen/option/MouseOptionsScreen.mapping | 2 + .../pack/ExperimentalWarningScreen.mapping | 2 + .../client/gui/screen/pack/PackScreen.mapping | 4 ++ .../report/AbuseReportReasonScreen.mapping | 7 ++++ .../screen/world/CreateWorldScreen.mapping | 1 + .../world/CustomizeBuffetLevelScreen.mapping | 2 + .../screen/world/EditGameRulesScreen.mapping | 2 + .../screen/world/ExperimentsScreen.mapping | 1 + .../client/gui/widget/EntryListWidget.mapping | 7 ++++ .../gui/widget/ThreePartsLayoutWidget.mapping | 4 ++ .../minecraft/client/model/ModelPart.mapping | 26 ++++++------ .../client/option/GameOptions.mapping | 7 +++- .../client/particle/DamageParticle.mapping | 8 ++-- .../particle/FireworksSparkParticle.mapping | 8 ++-- .../client/particle/FlameParticle.mapping | 8 ++-- .../client/particle/SquidInkParticle.mapping | 8 ++-- .../client/particle/SuspendParticle.mapping | 8 ++-- .../gui/screen/RealmsBackupScreen.mapping | 3 ++ .../RealmsClientIncompatibleScreen.mapping | 7 ++++ .../gui/screen/RealmsInviteScreen.mapping | 4 ++ .../gui/screen/RealmsPlayerScreen.mapping | 3 ++ .../render/ChunkRenderingDataPreparer.mapping | 26 ++++++------ .../client/render/GameRenderer.mapping | 5 +++ .../render/block/BlockModelRenderer.mapping | 40 +++++++++---------- .../client/render/chunk/ChunkBuilder.mapping | 2 +- .../model/json/JsonUnbakedModel.mapping | 30 +++++++------- .../render/model/json/ModelOverride.mapping | 16 ++++---- .../render/model/json/ModelVariantMap.mapping | 4 +- .../function/ApplyBonusLootFunction.mapping | 16 ++++---- .../network/codec/PacketCodecs.mapping | 22 +++++----- 42 files changed, 245 insertions(+), 142 deletions(-) diff --git a/mappings/net/minecraft/block/dispenser/DispenserBehavior.mapping b/mappings/net/minecraft/block/dispenser/DispenserBehavior.mapping index d12cc6cf96..b5f1061be0 100644 --- a/mappings/net/minecraft/block/dispenser/DispenserBehavior.mapping +++ b/mappings/net/minecraft/block/dispenser/DispenserBehavior.mapping @@ -12,23 +12,6 @@ CLASS net/minecraft/class_2357 net/minecraft/block/dispenser/DispenserBehavior ARG 0 pointer ARG 1 entityType ARG 2 direction - CLASS 2 - METHOD method_48306 (Lnet/minecraft/class_2350;Lnet/minecraft/class_1531;)V - ARG 1 entity - CLASS 3 - METHOD method_27159 (Lnet/minecraft/class_1309;)Z - ARG 0 entity - CLASS 4 - METHOD method_27160 (Lnet/minecraft/class_1496;)Z - ARG 0 entity - CLASS 5 - METHOD method_27161 (Lnet/minecraft/class_1492;)Z - ARG 0 entity - CLASS 7 - METHOD method_17204 (Lnet/minecraft/class_1799;Lnet/minecraft/class_1677;)V - ARG 1 entity - CLASS 9 - FIELD field_13368 fallbackBehavior Lnet/minecraft/class_2347; CLASS 10 FIELD field_49137 fallbackBehavior Lnet/minecraft/class_2347; CLASS 17 @@ -40,6 +23,9 @@ CLASS net/minecraft/class_2357 net/minecraft/block/dispenser/DispenserBehavior ARG 1 pointer ARG 2 emptyBottleStack ARG 3 filledBottleStack + CLASS 2 + METHOD method_48306 (Lnet/minecraft/class_2350;Lnet/minecraft/class_1531;)V + ARG 1 entity CLASS 22 FIELD field_38001 fallback Lnet/minecraft/class_2347; CLASS 24 @@ -59,3 +45,17 @@ CLASS net/minecraft/class_2357 net/minecraft/block/dispenser/DispenserBehavior CLASS 1 METHOD method_17202 (Lnet/minecraft/class_1799;Lnet/minecraft/class_1686;)V ARG 1 entity + CLASS 3 + METHOD method_27159 (Lnet/minecraft/class_1309;)Z + ARG 0 entity + CLASS 4 + METHOD method_27160 (Lnet/minecraft/class_1496;)Z + ARG 0 entity + CLASS 5 + METHOD method_27161 (Lnet/minecraft/class_1492;)Z + ARG 0 entity + CLASS 7 + METHOD method_17204 (Lnet/minecraft/class_1799;Lnet/minecraft/class_1677;)V + ARG 1 entity + CLASS 9 + FIELD field_13368 fallbackBehavior Lnet/minecraft/class_2347; diff --git a/mappings/net/minecraft/client/MinecraftClient.mapping b/mappings/net/minecraft/client/MinecraftClient.mapping index 6776d36e6b..0573065dcc 100644 --- a/mappings/net/minecraft/client/MinecraftClient.mapping +++ b/mappings/net/minecraft/client/MinecraftClient.mapping @@ -87,9 +87,9 @@ CLASS net/minecraft/class_310 net/minecraft/client/MinecraftClient FIELD field_1735 fpsCounter I FIELD field_1738 currentFps I FIELD field_1739 networkProxy Ljava/net/Proxy; + FIELD field_1740 DEFAULT_FONT_ID Lnet/minecraft/class_2960; FIELD field_17404 renderTaskQueue Ljava/util/Queue; FIELD field_17405 worldGenProgressTracker Ljava/util/concurrent/atomic/AtomicReference; - FIELD field_1740 DEFAULT_FONT_ID Lnet/minecraft/class_2960; FIELD field_1741 pausedTickDelta F FIELD field_1742 itemRenderer Lnet/minecraft/class_918; FIELD field_1743 skipGameRender Z diff --git a/mappings/net/minecraft/client/gl/PostEffectProcessor.mapping b/mappings/net/minecraft/client/gl/PostEffectProcessor.mapping index 5235ebb010..5eae9e9efa 100644 --- a/mappings/net/minecraft/client/gl/PostEffectProcessor.mapping +++ b/mappings/net/minecraft/client/gl/PostEffectProcessor.mapping @@ -43,3 +43,6 @@ CLASS net/minecraft/class_279 net/minecraft/client/gl/PostEffectProcessor METHOD method_1266 getTarget (Ljava/lang/String;)Lnet/minecraft/class_276; ARG 1 name METHOD method_1267 setupProjectionMatrix ()V + METHOD method_57799 setUniforms (Ljava/lang/String;F)V + ARG 1 name + ARG 2 value diff --git a/mappings/net/minecraft/client/gui/RotatingCubeMapRenderer.mapping b/mappings/net/minecraft/client/gui/RotatingCubeMapRenderer.mapping index 82151a3f11..6b8760c109 100644 --- a/mappings/net/minecraft/client/gui/RotatingCubeMapRenderer.mapping +++ b/mappings/net/minecraft/client/gui/RotatingCubeMapRenderer.mapping @@ -11,3 +11,5 @@ CLASS net/minecraft/class_766 net/minecraft/client/gui/RotatingCubeMapRenderer METHOD method_45780 wrapOnce (FF)F ARG 0 a ARG 1 b + METHOD method_57798 render (F)V + ARG 1 delta diff --git a/mappings/net/minecraft/client/gui/screen/OutOfMemoryScreen.mapping b/mappings/net/minecraft/client/gui/screen/OutOfMemoryScreen.mapping index 060b049448..787b8cc254 100644 --- a/mappings/net/minecraft/client/gui/screen/OutOfMemoryScreen.mapping +++ b/mappings/net/minecraft/client/gui/screen/OutOfMemoryScreen.mapping @@ -1,4 +1,7 @@ CLASS net/minecraft/class_428 net/minecraft/client/gui/screen/OutOfMemoryScreen + FIELD field_49504 TITLE Lnet/minecraft/class_2561; + FIELD field_49505 MESSAGE Lnet/minecraft/class_2561; + FIELD field_49507 layout Lnet/minecraft/class_8132; 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/Screen.mapping b/mappings/net/minecraft/client/gui/screen/Screen.mapping index e1a7638a59..ff44c35c33 100644 --- a/mappings/net/minecraft/client/gui/screen/Screen.mapping +++ b/mappings/net/minecraft/client/gui/screen/Screen.mapping @@ -23,6 +23,10 @@ CLASS net/minecraft/class_437 net/minecraft/client/gui/screen/Screen FIELD field_41685 tooltip Lnet/minecraft/class_437$class_7998; FIELD field_42156 screenInitialized Z FIELD field_44944 executor Ljava/util/concurrent/Executor; + FIELD field_49508 PANORAMA_RENDERER Lnet/minecraft/class_751; + FIELD field_49509 ROTATIONG_PANORAMA_RENDERER Lnet/minecraft/class_766; + FIELD field_49510 PANORAMA_OVERLAY_TEXTURE Lnet/minecraft/class_2960; + FIELD field_49511 MENU_BACKGROUND_TEXTURE Lnet/minecraft/class_2960; METHOD (Lnet/minecraft/class_2561;)V ARG 1 title METHOD method_25393 tick ()V @@ -166,6 +170,25 @@ CLASS net/minecraft/class_437 net/minecraft/client/gui/screen/Screen ARG 1 context METHOD method_53870 getUsageNarrationText ()Lnet/minecraft/class_2561; METHOD method_56131 setInitialFocus ()V + METHOD method_57728 renderPanoramaBackground (Lnet/minecraft/class_332;F)V + ARG 1 context + ARG 2 delta + METHOD method_57734 applyBlur (F)V + ARG 1 delta + METHOD method_57735 renderDarkening (Lnet/minecraft/class_332;)V + ARG 1 context + METHOD method_57736 renderDarkening (Lnet/minecraft/class_332;IIII)V + ARG 1 context + ARG 2 x + ARG 3 y + ARG 4 width + ARG 5 height + METHOD method_57737 renderBackgroundTexture (Lnet/minecraft/class_332;IIII)V + ARG 0 context + ARG 1 x + ARG 2 y + ARG 3 width + ARG 4 height 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/StatsScreen.mapping b/mappings/net/minecraft/client/gui/screen/StatsScreen.mapping index 8a44a7310a..5ebccba10f 100644 --- a/mappings/net/minecraft/client/gui/screen/StatsScreen.mapping +++ b/mappings/net/minecraft/client/gui/screen/StatsScreen.mapping @@ -57,10 +57,6 @@ CLASS net/minecraft/class_447 net/minecraft/client/gui/screen/StatsScreen ARG 1 statType METHOD method_19410 getStatType (I)Lnet/minecraft/class_3448; ARG 1 headerColumn - CLASS class_450 ItemComparator - METHOD compare (Ljava/lang/Object;Ljava/lang/Object;)I - ARG 1 a - ARG 2 b CLASS class_4199 Entry FIELD field_33830 item Lnet/minecraft/class_1792; METHOD (Lnet/minecraft/class_447$class_4200;Lnet/minecraft/class_1792;)V @@ -72,6 +68,10 @@ CLASS net/minecraft/class_447 net/minecraft/client/gui/screen/StatsScreen ARG 4 y ARG 5 white METHOD method_37307 getItem ()Lnet/minecraft/class_1792; + CLASS class_450 ItemComparator + METHOD compare (Ljava/lang/Object;Ljava/lang/Object;)I + ARG 1 a + ARG 2 b CLASS class_4202 EntityStatsListWidget FIELD field_18763 screen Lnet/minecraft/class_447; METHOD (Lnet/minecraft/class_447;Lnet/minecraft/class_310;)V diff --git a/mappings/net/minecraft/client/gui/screen/advancement/AdvancementsScreen.mapping b/mappings/net/minecraft/client/gui/screen/advancement/AdvancementsScreen.mapping index 0d3f582ef5..3ee11ee043 100644 --- a/mappings/net/minecraft/client/gui/screen/advancement/AdvancementsScreen.mapping +++ b/mappings/net/minecraft/client/gui/screen/advancement/AdvancementsScreen.mapping @@ -15,8 +15,13 @@ CLASS net/minecraft/class_457 net/minecraft/client/gui/screen/advancement/Advanc FIELD field_32307 PAGE_OFFSET_Y I FIELD field_32308 TITLE_OFFSET_X I FIELD field_32309 TITLE_OFFSET_Y I + FIELD field_49530 layout Lnet/minecraft/class_8132; + FIELD field_49531 parent Lnet/minecraft/class_437; + METHOD (Lnet/minecraft/class_632;)V + ARG 1 advancementHandler METHOD (Lnet/minecraft/class_632;Lnet/minecraft/class_437;)V ARG 1 advancementHandler + ARG 2 parent METHOD method_2334 drawWindow (Lnet/minecraft/class_332;II)V ARG 1 context ARG 2 x diff --git a/mappings/net/minecraft/client/gui/screen/ingame/BeaconScreen.mapping b/mappings/net/minecraft/client/gui/screen/ingame/BeaconScreen.mapping index bd6b7c3f16..e6b180fbdb 100644 --- a/mappings/net/minecraft/client/gui/screen/ingame/BeaconScreen.mapping +++ b/mappings/net/minecraft/client/gui/screen/ingame/BeaconScreen.mapping @@ -20,6 +20,13 @@ CLASS net/minecraft/class_466 net/minecraft/client/gui/screen/ingame/BeaconScree METHOD method_37076 addButton (Lnet/minecraft/class_339;)V ARG 1 button METHOD method_37078 tickButtons ()V + CLASS class_4072 IconButtonWidget + FIELD field_45445 texture Lnet/minecraft/class_2960; + METHOD (IILnet/minecraft/class_2960;Lnet/minecraft/class_2561;)V + ARG 1 x + ARG 2 y + ARG 3 texture + ARG 4 message CLASS class_467 CancelButtonWidget METHOD (Lnet/minecraft/class_466;II)V ARG 2 x @@ -57,13 +64,6 @@ CLASS net/minecraft/class_466 net/minecraft/client/gui/screen/ingame/BeaconScree METHOD method_2401 setDisabled (Z)V ARG 1 disabled METHOD method_2402 isDisabled ()Z - CLASS class_4072 IconButtonWidget - FIELD field_45445 texture Lnet/minecraft/class_2960; - METHOD (IILnet/minecraft/class_2960;Lnet/minecraft/class_2561;)V - ARG 1 x - ARG 2 y - ARG 3 texture - ARG 4 message CLASS class_6392 BeaconButtonWidget METHOD method_37080 tick (I)V ARG 1 level diff --git a/mappings/net/minecraft/client/gui/screen/multiplayer/MultiplayerServerListWidget.mapping b/mappings/net/minecraft/client/gui/screen/multiplayer/MultiplayerServerListWidget.mapping index 7090def805..e016739100 100644 --- a/mappings/net/minecraft/client/gui/screen/multiplayer/MultiplayerServerListWidget.mapping +++ b/mappings/net/minecraft/client/gui/screen/multiplayer/MultiplayerServerListWidget.mapping @@ -47,7 +47,6 @@ CLASS net/minecraft/class_4267 net/minecraft/client/gui/screen/multiplayer/Multi METHOD method_36889 (Lnet/minecraft/class_4267;Lnet/minecraft/class_350$class_351;)V ARG 1 server METHOD method_52204 onRemoved ()V - CLASS class_504 Entry CLASS class_4268 ScanningEntry FIELD field_19112 client Lnet/minecraft/class_310; CLASS class_4269 LanServerEntry @@ -89,3 +88,4 @@ CLASS net/minecraft/class_4267 net/minecraft/client/gui/screen/multiplayer/Multi METHOD method_49300 uploadFavicon ([B)Z ARG 1 bytes METHOD method_55815 update ()V + CLASS class_504 Entry diff --git a/mappings/net/minecraft/client/gui/screen/multiplayer/SocialInteractionsScreen.mapping b/mappings/net/minecraft/client/gui/screen/multiplayer/SocialInteractionsScreen.mapping index 604c38969c..2dcd99224c 100644 --- a/mappings/net/minecraft/client/gui/screen/multiplayer/SocialInteractionsScreen.mapping +++ b/mappings/net/minecraft/client/gui/screen/multiplayer/SocialInteractionsScreen.mapping @@ -23,6 +23,11 @@ CLASS net/minecraft/class_5522 net/minecraft/client/gui/screen/multiplayer/Socia FIELD field_26919 BLOCKING_TEXT Lnet/minecraft/class_2561; FIELD field_45564 BACKGROUND_TEXTURE Lnet/minecraft/class_2960; FIELD field_45565 SEARCH_ICON_TEXTURE Lnet/minecraft/class_2960; + FIELD field_49549 layout Lnet/minecraft/class_8132; + FIELD field_49550 parent Lnet/minecraft/class_437; + FIELD field_49551 TITLE Lnet/minecraft/class_2561; + METHOD (Lnet/minecraft/class_437;)V + ARG 1 parent METHOD method_31350 updateServerLabel (Lnet/minecraft/class_310;)V ARG 1 client METHOD method_31351 (Lnet/minecraft/class_4185;)V diff --git a/mappings/net/minecraft/client/gui/screen/option/GameOptionsScreen.mapping b/mappings/net/minecraft/client/gui/screen/option/GameOptionsScreen.mapping index b32e974974..7e180dc712 100644 --- a/mappings/net/minecraft/client/gui/screen/option/GameOptionsScreen.mapping +++ b/mappings/net/minecraft/client/gui/screen/option/GameOptionsScreen.mapping @@ -1,7 +1,10 @@ CLASS net/minecraft/class_4667 net/minecraft/client/gui/screen/option/GameOptionsScreen FIELD field_21335 parent Lnet/minecraft/class_437; FIELD field_21336 gameOptions Lnet/minecraft/class_315; + FIELD field_49503 layour Lnet/minecraft/class_8132; METHOD (Lnet/minecraft/class_437;Lnet/minecraft/class_315;Lnet/minecraft/class_2561;)V + ARG 1 parent ARG 2 gameOptions ARG 3 title METHOD method_31387 initFooter ()V + METHOD method_57732 initHeader ()V diff --git a/mappings/net/minecraft/client/gui/screen/option/MouseOptionsScreen.mapping b/mappings/net/minecraft/client/gui/screen/option/MouseOptionsScreen.mapping index 28c283c7ea..026d662d77 100644 --- a/mappings/net/minecraft/client/gui/screen/option/MouseOptionsScreen.mapping +++ b/mappings/net/minecraft/client/gui/screen/option/MouseOptionsScreen.mapping @@ -1,5 +1,7 @@ CLASS net/minecraft/class_4288 net/minecraft/client/gui/screen/option/MouseOptionsScreen FIELD field_19246 buttonList Lnet/minecraft/class_353; + FIELD field_49498 TITLE Lnet/minecraft/class_2561; + FIELD field_49499 layout Lnet/minecraft/class_8132; METHOD (Lnet/minecraft/class_437;Lnet/minecraft/class_315;)V ARG 1 parent ARG 2 gameOptions diff --git a/mappings/net/minecraft/client/gui/screen/pack/ExperimentalWarningScreen.mapping b/mappings/net/minecraft/client/gui/screen/pack/ExperimentalWarningScreen.mapping index 3e82d77e91..a596e18f48 100644 --- a/mappings/net/minecraft/client/gui/screen/pack/ExperimentalWarningScreen.mapping +++ b/mappings/net/minecraft/client/gui/screen/pack/ExperimentalWarningScreen.mapping @@ -17,6 +17,8 @@ CLASS net/minecraft/class_7745 net/minecraft/client/gui/screen/pack/Experimental METHOD method_49008 (Lnet/minecraft/class_7745;Lnet/minecraft/class_364;)V ARG 1 child CLASS class_7746 DetailsScreen + FIELD field_49555 TITLE Lnet/minecraft/class_2561; + FIELD field_49556 layout Lnet/minecraft/class_8132; METHOD method_45671 (Lnet/minecraft/class_4185;)V ARG 1 button CLASS class_7747 PackListWidget diff --git a/mappings/net/minecraft/client/gui/screen/pack/PackScreen.mapping b/mappings/net/minecraft/client/gui/screen/pack/PackScreen.mapping index 20b6d53821..052462591c 100644 --- a/mappings/net/minecraft/client/gui/screen/pack/PackScreen.mapping +++ b/mappings/net/minecraft/client/gui/screen/pack/PackScreen.mapping @@ -11,6 +11,10 @@ CLASS net/minecraft/class_5375 net/minecraft/client/gui/screen/pack/PackScreen FIELD field_25787 directoryWatcher Lnet/minecraft/class_5375$class_5426; FIELD field_25788 refreshTimeout J FIELD field_25789 iconTextures Ljava/util/Map; + FIELD field_49541 AVAILABLE_TITLE Lnet/minecraft/class_2561; + FIELD field_49542 SELECTED_TITLE Lnet/minecraft/class_2561; + FIELD field_49543 OPEN_FOLDER Lnet/minecraft/class_2561; + FIELD field_49544 layout Lnet/minecraft/class_8132; METHOD (Lnet/minecraft/class_3283;Ljava/util/function/Consumer;Ljava/nio/file/Path;Lnet/minecraft/class_2561;)V ARG 1 resourcePackManager ARG 2 applier diff --git a/mappings/net/minecraft/client/gui/screen/report/AbuseReportReasonScreen.mapping b/mappings/net/minecraft/client/gui/screen/report/AbuseReportReasonScreen.mapping index 4efc765f8c..c199725178 100644 --- a/mappings/net/minecraft/client/gui/screen/report/AbuseReportReasonScreen.mapping +++ b/mappings/net/minecraft/client/gui/screen/report/AbuseReportReasonScreen.mapping @@ -7,13 +7,20 @@ CLASS net/minecraft/class_7551 net/minecraft/client/gui/screen/report/AbuseRepor FIELD field_39735 TOP_MARGIN I FIELD field_39754 READ_INFO_TEXT Lnet/minecraft/class_2561; FIELD field_39778 reason Lnet/minecraft/class_7573; + FIELD field_49548 layout Lnet/minecraft/class_8132; METHOD (Lnet/minecraft/class_437;Lnet/minecraft/class_7573;Ljava/util/function/Consumer;)V + ARG 1 parent ARG 2 reason ARG 3 reasonConsumer METHOD method_44520 (Lnet/minecraft/class_4185;)V ARG 1 button METHOD method_44668 getTop ()I METHOD method_44669 getBottom ()I + METHOD method_57759 getRight ()I + METHOD method_57760 getWidth ()I + METHOD method_57761 getHeight ()I + METHOD method_57762 getReasonListHeight ()I + METHOD method_57764 getLeft ()I CLASS class_7552 ReasonListWidget METHOD (Lnet/minecraft/class_7551;Lnet/minecraft/class_310;)V ARG 2 client diff --git a/mappings/net/minecraft/client/gui/screen/world/CreateWorldScreen.mapping b/mappings/net/minecraft/client/gui/screen/world/CreateWorldScreen.mapping index 3f5aad040c..84fbefdf68 100644 --- a/mappings/net/minecraft/client/gui/screen/world/CreateWorldScreen.mapping +++ b/mappings/net/minecraft/client/gui/screen/world/CreateWorldScreen.mapping @@ -16,6 +16,7 @@ CLASS net/minecraft/class_525 net/minecraft/client/gui/screen/world/CreateWorldS FIELD field_43081 HEADER_SEPARATOR_TEXTURE Lnet/minecraft/class_2960; FIELD field_43082 FOOTER_SEPARATOR_TEXTURE Lnet/minecraft/class_2960; FIELD field_45568 symlinkFinder Lnet/minecraft/class_8580; + FIELD field_49557 layout Lnet/minecraft/class_8132; METHOD (Lnet/minecraft/class_310;Lnet/minecraft/class_437;Lnet/minecraft/class_7193;Ljava/util/Optional;Ljava/util/OptionalLong;)V ARG 1 client ARG 2 parent diff --git a/mappings/net/minecraft/client/gui/screen/world/CustomizeBuffetLevelScreen.mapping b/mappings/net/minecraft/client/gui/screen/world/CustomizeBuffetLevelScreen.mapping index 922b150857..8754f9ce07 100644 --- a/mappings/net/minecraft/client/gui/screen/world/CustomizeBuffetLevelScreen.mapping +++ b/mappings/net/minecraft/client/gui/screen/world/CustomizeBuffetLevelScreen.mapping @@ -6,7 +6,9 @@ CLASS net/minecraft/class_415 net/minecraft/client/gui/screen/world/CustomizeBuf FIELD field_25040 biome Lnet/minecraft/class_6880; FIELD field_25888 biomeRegistry Lnet/minecraft/class_2378; FIELD field_26535 BUFFET_BIOME_TEXT Lnet/minecraft/class_2561; + FIELD field_49495 layout Lnet/minecraft/class_8132; 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 diff --git a/mappings/net/minecraft/client/gui/screen/world/EditGameRulesScreen.mapping b/mappings/net/minecraft/client/gui/screen/world/EditGameRulesScreen.mapping index 0e3675c1c4..1f59a73b2f 100644 --- a/mappings/net/minecraft/client/gui/screen/world/EditGameRulesScreen.mapping +++ b/mappings/net/minecraft/client/gui/screen/world/EditGameRulesScreen.mapping @@ -3,6 +3,8 @@ CLASS net/minecraft/class_5235 net/minecraft/client/gui/screen/world/EditGameRul FIELD field_24295 invalidRuleWidgets Ljava/util/Set; FIELD field_24296 doneButton Lnet/minecraft/class_4185; FIELD field_24298 gameRules Lnet/minecraft/class_1928; + FIELD field_49558 TITLE Lnet/minecraft/class_2561; + FIELD field_49560 layout Lnet/minecraft/class_8132; METHOD (Lnet/minecraft/class_1928;Ljava/util/function/Consumer;)V ARG 1 gameRules ARG 2 ruleSaveConsumer diff --git a/mappings/net/minecraft/client/gui/screen/world/ExperimentsScreen.mapping b/mappings/net/minecraft/client/gui/screen/world/ExperimentsScreen.mapping index e8fe348bd1..46283b9603 100644 --- a/mappings/net/minecraft/client/gui/screen/world/ExperimentsScreen.mapping +++ b/mappings/net/minecraft/client/gui/screen/world/ExperimentsScreen.mapping @@ -5,6 +5,7 @@ CLASS net/minecraft/class_8134 net/minecraft/client/gui/screen/world/Experiments FIELD field_42506 resourcePackManager Lnet/minecraft/class_3283; FIELD field_42507 applier Ljava/util/function/Consumer; FIELD field_42508 experiments Lit/unimi/dsi/fastutil/objects/Object2BooleanMap; + FIELD field_49562 TITLE Lnet/minecraft/class_2561; METHOD (Lnet/minecraft/class_437;Lnet/minecraft/class_3283;Ljava/util/function/Consumer;)V ARG 1 parent ARG 2 resourcePackManager diff --git a/mappings/net/minecraft/client/gui/widget/EntryListWidget.mapping b/mappings/net/minecraft/client/gui/widget/EntryListWidget.mapping index 4b3b8e39ef..94f36d4989 100644 --- a/mappings/net/minecraft/client/gui/widget/EntryListWidget.mapping +++ b/mappings/net/minecraft/client/gui/widget/EntryListWidget.mapping @@ -125,6 +125,13 @@ CLASS net/minecraft/class_350 net/minecraft/client/gui/widget/EntryListWidget ARG 1 context METHOD method_53812 isSelectButton (I)Z ARG 1 button + METHOD method_57712 position (ILnet/minecraft/class_8132;)V + ARG 1 width + ARG 2 layout + METHOD method_57714 position (III)V + ARG 1 width + ARG 2 height + ARG 3 y CLASS class_351 Entry FIELD field_22752 parentList Lnet/minecraft/class_350; METHOD method_25343 render (Lnet/minecraft/class_332;IIIIIIIZF)V diff --git a/mappings/net/minecraft/client/gui/widget/ThreePartsLayoutWidget.mapping b/mappings/net/minecraft/client/gui/widget/ThreePartsLayoutWidget.mapping index 4b12b14516..5982a43b2e 100644 --- a/mappings/net/minecraft/client/gui/widget/ThreePartsLayoutWidget.mapping +++ b/mappings/net/minecraft/client/gui/widget/ThreePartsLayoutWidget.mapping @@ -37,3 +37,7 @@ CLASS net/minecraft/class_8132 net/minecraft/client/gui/widget/ThreePartsLayoutW METHOD method_49000 addBody (Lnet/minecraft/class_8021;Ljava/util/function/Consumer;)Lnet/minecraft/class_8021; ARG 1 widget ARG 2 callback + METHOD method_57726 addHeader (Lnet/minecraft/class_2561;Lnet/minecraft/class_327;)V + ARG 1 text + ARG 2 textRenderer + METHOD method_57727 getContentHeight ()I diff --git a/mappings/net/minecraft/client/model/ModelPart.mapping b/mappings/net/minecraft/client/model/ModelPart.mapping index 7c43cef311..bd3cb66199 100644 --- a/mappings/net/minecraft/client/model/ModelPart.mapping +++ b/mappings/net/minecraft/client/model/ModelPart.mapping @@ -112,6 +112,19 @@ CLASS net/minecraft/class_630 net/minecraft/client/model/ModelPart METHOD method_2837 remap (FF)Lnet/minecraft/class_630$class_618; ARG 1 u ARG 2 v + CLASS class_6229 CuboidConsumer + METHOD method_35748 accept (Lnet/minecraft/class_4587$class_4665;Ljava/lang/String;ILnet/minecraft/class_630$class_628;)V + COMMENT Accepts a cuboid from a model part. + COMMENT + COMMENT @see ModelPart#forEachCuboid(MatrixStack, CuboidConsumer) + ARG 1 matrix + COMMENT the current matrix transformation from the model parts + ARG 2 path + COMMENT the path of the current model part, separated by {@code /} + ARG 3 index + COMMENT the index of the current cuboid in the current model part + ARG 4 cuboid + COMMENT the current cuboid CLASS class_628 Cuboid FIELD field_3643 minZ F FIELD field_3644 minY F @@ -144,16 +157,3 @@ CLASS net/minecraft/class_630 net/minecraft/client/model/ModelPart ARG 6 green ARG 7 blue ARG 8 alpha - CLASS class_6229 CuboidConsumer - METHOD method_35748 accept (Lnet/minecraft/class_4587$class_4665;Ljava/lang/String;ILnet/minecraft/class_630$class_628;)V - COMMENT Accepts a cuboid from a model part. - COMMENT - COMMENT @see ModelPart#forEachCuboid(MatrixStack, CuboidConsumer) - ARG 1 matrix - COMMENT the current matrix transformation from the model parts - ARG 2 path - COMMENT the path of the current model part, separated by {@code /} - ARG 3 index - COMMENT the index of the current cuboid in the current model part - ARG 4 cuboid - COMMENT the current cuboid diff --git a/mappings/net/minecraft/client/option/GameOptions.mapping b/mappings/net/minecraft/client/option/GameOptions.mapping index 8fe593ab3a..92da52209c 100644 --- a/mappings/net/minecraft/client/option/GameOptions.mapping +++ b/mappings/net/minecraft/client/option/GameOptions.mapping @@ -90,9 +90,9 @@ CLASS net/minecraft/class_315 net/minecraft/client/option/GameOptions COMMENT or {@linkplain net.minecraft.block.Block#getPickStack(net.minecraft.world.WorldView, COMMENT net.minecraft.util.math.BlockPos, net.minecraft.block.BlockState) block} the player is looking at. COMMENT Bound to {@linkplain org.lwjgl.glfw.GLFW#GLFW_MOUSE_BUTTON_MIDDLE the middle mouse button} by default. + FIELD field_1872 overrideWidth I FIELD field_18725 backgroundForChatOnly Lnet/minecraft/class_7172; FIELD field_18726 textBackgroundOpacity Lnet/minecraft/class_7172; - FIELD field_1872 overrideWidth I FIELD field_1873 autoSuggestions Lnet/minecraft/class_7172; FIELD field_1874 loadToolbarActivatorKey Lnet/minecraft/class_304; COMMENT A key binding for loading the hotbar items in {@linkplain net.minecraft.world.GameMode#CREATIVE creative mode}. @@ -223,6 +223,9 @@ CLASS net/minecraft/class_315 net/minecraft/client/option/GameOptions FIELD field_46854 HIDE_SPLASH_TEXTS_TOOLTIP Lnet/minecraft/class_2561; FIELD field_46855 hideSplashTexts Lnet/minecraft/class_7172; FIELD field_49105 japaneseGlyphVariants Lnet/minecraft/class_7172; + FIELD field_49474 MENU_BACKGROUND_BLURRINESS_TOOLTIP Lnet/minecraft/class_2561; + FIELD field_49475 DEFAULT_MENU_BACKGROUND_BLURRINESS D + FIELD field_49476 menuBackgroundBlurriness Lnet/minecraft/class_7172; METHOD (Lnet/minecraft/class_310;Ljava/io/File;)V ARG 1 client ARG 2 optionsFile @@ -605,6 +608,8 @@ CLASS net/minecraft/class_315 net/minecraft/client/option/GameOptions METHOD method_57021 shouldUseJapaneseGlyphsByDefault ()Z METHOD method_57022 (Ljava/lang/Boolean;)V ARG 0 value + METHOD method_57702 getMenuBackgroundBlurriness ()Lnet/minecraft/class_7172; + METHOD method_57703 getMenuBackgroundBlurrinessValue ()D CLASS 2 METHOD method_33676 find (Ljava/lang/String;)Ljava/lang/String; ARG 1 key diff --git a/mappings/net/minecraft/client/particle/DamageParticle.mapping b/mappings/net/minecraft/client/particle/DamageParticle.mapping index 277046a1ee..46ce657085 100644 --- a/mappings/net/minecraft/client/particle/DamageParticle.mapping +++ b/mappings/net/minecraft/client/particle/DamageParticle.mapping @@ -1,4 +1,8 @@ CLASS net/minecraft/class_657 net/minecraft/client/particle/DamageParticle + CLASS class_3939 Factory + FIELD field_18291 spriteProvider Lnet/minecraft/class_4002; + METHOD (Lnet/minecraft/class_4002;)V + ARG 1 spriteProvider CLASS class_658 DefaultFactory FIELD field_17790 spriteProvider Lnet/minecraft/class_4002; METHOD (Lnet/minecraft/class_4002;)V @@ -7,7 +11,3 @@ CLASS net/minecraft/class_657 net/minecraft/client/particle/DamageParticle FIELD field_17791 spriteProvider Lnet/minecraft/class_4002; METHOD (Lnet/minecraft/class_4002;)V ARG 1 spriteProvider - CLASS class_3939 Factory - FIELD field_18291 spriteProvider Lnet/minecraft/class_4002; - METHOD (Lnet/minecraft/class_4002;)V - ARG 1 spriteProvider diff --git a/mappings/net/minecraft/client/particle/FireworksSparkParticle.mapping b/mappings/net/minecraft/client/particle/FireworksSparkParticle.mapping index ff2ab76e22..11335bf42b 100644 --- a/mappings/net/minecraft/client/particle/FireworksSparkParticle.mapping +++ b/mappings/net/minecraft/client/particle/FireworksSparkParticle.mapping @@ -1,4 +1,8 @@ CLASS net/minecraft/class_677 net/minecraft/client/particle/FireworksSparkParticle + CLASS class_3997 FlashFactory + FIELD field_17810 spriteProvider Lnet/minecraft/class_4002; + METHOD (Lnet/minecraft/class_4002;)V + ARG 1 spriteProvider CLASS class_678 Flash CLASS class_679 ExplosionFactory FIELD field_17811 spriteProvider Lnet/minecraft/class_4002; @@ -60,7 +64,3 @@ CLASS net/minecraft/class_677 net/minecraft/client/particle/FireworksSparkPartic METHOD method_3032 explodeBurst (Lit/unimi/dsi/fastutil/ints/IntList;Lit/unimi/dsi/fastutil/ints/IntList;ZZ)V ARG 3 trail ARG 4 flicker - CLASS class_3997 FlashFactory - FIELD field_17810 spriteProvider Lnet/minecraft/class_4002; - METHOD (Lnet/minecraft/class_4002;)V - ARG 1 spriteProvider diff --git a/mappings/net/minecraft/client/particle/FlameParticle.mapping b/mappings/net/minecraft/client/particle/FlameParticle.mapping index 6e83c1c7a5..e6493e1bf8 100644 --- a/mappings/net/minecraft/client/particle/FlameParticle.mapping +++ b/mappings/net/minecraft/client/particle/FlameParticle.mapping @@ -1,9 +1,9 @@ CLASS net/minecraft/class_687 net/minecraft/client/particle/FlameParticle - CLASS class_688 Factory - FIELD field_17812 spriteProvider Lnet/minecraft/class_4002; - METHOD (Lnet/minecraft/class_4002;)V - ARG 1 spriteProvider CLASS class_5613 SmallFactory FIELD field_27736 spriteProvider Lnet/minecraft/class_4002; METHOD (Lnet/minecraft/class_4002;)V ARG 1 spriteProvider + CLASS class_688 Factory + FIELD field_17812 spriteProvider Lnet/minecraft/class_4002; + METHOD (Lnet/minecraft/class_4002;)V + ARG 1 spriteProvider diff --git a/mappings/net/minecraft/client/particle/SquidInkParticle.mapping b/mappings/net/minecraft/client/particle/SquidInkParticle.mapping index 800f5ed9f6..aa7abefcbb 100644 --- a/mappings/net/minecraft/client/particle/SquidInkParticle.mapping +++ b/mappings/net/minecraft/client/particle/SquidInkParticle.mapping @@ -9,11 +9,11 @@ CLASS net/minecraft/class_725 net/minecraft/client/particle/SquidInkParticle ARG 12 velocityZ ARG 14 color ARG 15 spriteProvider - CLASS class_726 Factory - FIELD field_17878 spriteProvider Lnet/minecraft/class_4002; - METHOD (Lnet/minecraft/class_4002;)V - ARG 1 spriteProvider CLASS class_5788 GlowSquidInkFactory FIELD field_28460 spriteProvider Lnet/minecraft/class_4002; METHOD (Lnet/minecraft/class_4002;)V ARG 1 spriteProvider + CLASS class_726 Factory + FIELD field_17878 spriteProvider Lnet/minecraft/class_4002; + METHOD (Lnet/minecraft/class_4002;)V + ARG 1 spriteProvider diff --git a/mappings/net/minecraft/client/particle/SuspendParticle.mapping b/mappings/net/minecraft/client/particle/SuspendParticle.mapping index b68e57ce3f..d84ff5de2c 100644 --- a/mappings/net/minecraft/client/particle/SuspendParticle.mapping +++ b/mappings/net/minecraft/client/particle/SuspendParticle.mapping @@ -1,4 +1,8 @@ CLASS net/minecraft/class_729 net/minecraft/client/particle/SuspendParticle + CLASS class_3991 Factory + FIELD field_17880 spriteProvider Lnet/minecraft/class_4002; + METHOD (Lnet/minecraft/class_4002;)V + ARG 1 spriteProvider CLASS class_730 DolphinFactory FIELD field_17881 spriteProvider Lnet/minecraft/class_4002; METHOD (Lnet/minecraft/class_4002;)V @@ -11,10 +15,6 @@ CLASS net/minecraft/class_729 net/minecraft/client/particle/SuspendParticle FIELD field_17883 spriteProvider Lnet/minecraft/class_4002; METHOD (Lnet/minecraft/class_4002;)V ARG 1 spriteProvider - CLASS class_3991 Factory - FIELD field_17880 spriteProvider Lnet/minecraft/class_4002; - METHOD (Lnet/minecraft/class_4002;)V - ARG 1 spriteProvider CLASS class_8254 EggCrackFactory FIELD field_43374 spriteProvider Lnet/minecraft/class_4002; METHOD (Lnet/minecraft/class_4002;)V diff --git a/mappings/net/minecraft/client/realms/gui/screen/RealmsBackupScreen.mapping b/mappings/net/minecraft/client/realms/gui/screen/RealmsBackupScreen.mapping index a7ce78c587..f82027e94c 100644 --- a/mappings/net/minecraft/client/realms/gui/screen/RealmsBackupScreen.mapping +++ b/mappings/net/minecraft/client/realms/gui/screen/RealmsBackupScreen.mapping @@ -11,6 +11,8 @@ CLASS net/minecraft/class_4381 net/minecraft/client/realms/gui/screen/RealmsBack FIELD field_26473 BACKUPS_TEXT Lnet/minecraft/class_2561; FIELD field_26474 NO_BACKUPS_TEXT Lnet/minecraft/class_2561; FIELD field_32119 UPLOADED Ljava/lang/String; + FIELD field_49448 selectionList Lnet/minecraft/class_4381$class_4382; + FIELD field_49449 layout Lnet/minecraft/class_8132; METHOD (Lnet/minecraft/class_4388;Lnet/minecraft/class_4877;I)V ARG 1 parent ARG 2 serverData @@ -22,6 +24,7 @@ CLASS net/minecraft/class_4381 net/minecraft/client/realms/gui/screen/RealmsBack ARG 1 confirmed METHOD method_25113 (Lnet/minecraft/class_4185;)V ARG 1 button + METHOD method_57661 startBackupFetcher ()V CLASS class_4382 BackupObjectSelectionList METHOD method_21173 addEntry (Lnet/minecraft/class_4867;)V ARG 1 backup diff --git a/mappings/net/minecraft/client/realms/gui/screen/RealmsClientIncompatibleScreen.mapping b/mappings/net/minecraft/client/realms/gui/screen/RealmsClientIncompatibleScreen.mapping index 55aee5a011..3158e20720 100644 --- a/mappings/net/minecraft/client/realms/gui/screen/RealmsClientIncompatibleScreen.mapping +++ b/mappings/net/minecraft/client/realms/gui/screen/RealmsClientIncompatibleScreen.mapping @@ -1,3 +1,10 @@ CLASS net/minecraft/class_4387 net/minecraft/client/realms/gui/screen/RealmsClientIncompatibleScreen FIELD field_19787 parent Lnet/minecraft/class_437; FIELD field_26477 INCOMPATIBLE_TITLE Lnet/minecraft/class_2561; + FIELD field_49453 layout Lnet/minecraft/class_8132; + FIELD field_49454 GAME_VERSION Lnet/minecraft/class_2561; + FIELD field_49455 UNSUPPORTED_SNAPSHOT_VERSION Lnet/minecraft/class_2561; + FIELD field_49456 OUTDATED_STABLE_VERSION Lnet/minecraft/class_2561; + METHOD (Lnet/minecraft/class_437;)V + ARG 1 parent + METHOD method_57675 getErrorText ()Lnet/minecraft/class_2561; diff --git a/mappings/net/minecraft/client/realms/gui/screen/RealmsInviteScreen.mapping b/mappings/net/minecraft/client/realms/gui/screen/RealmsInviteScreen.mapping index 8c0e96f8e0..8099f46dec 100644 --- a/mappings/net/minecraft/client/realms/gui/screen/RealmsInviteScreen.mapping +++ b/mappings/net/minecraft/client/realms/gui/screen/RealmsInviteScreen.mapping @@ -8,7 +8,11 @@ CLASS net/minecraft/class_4395 net/minecraft/client/realms/gui/screen/RealmsInvi FIELD field_26489 INVITE_PROFILE_NAME_TEXT Lnet/minecraft/class_2561; FIELD field_26490 PLAYER_ERROR_TEXT Lnet/minecraft/class_2561; FIELD field_44943 INVITING_TEXT Lnet/minecraft/class_2561; + FIELD field_49457 layout Lnet/minecraft/class_8132; + FIELD field_49458 inviteButton Lnet/minecraft/class_4185; + FIELD field_49459 INVITE_TEXT Lnet/minecraft/class_2561; METHOD (Lnet/minecraft/class_4388;Lnet/minecraft/class_437;Lnet/minecraft/class_4877;)V + ARG 1 configureScreen ARG 2 parent ARG 3 serverData METHOD method_21284 onInvite ()V diff --git a/mappings/net/minecraft/client/realms/gui/screen/RealmsPlayerScreen.mapping b/mappings/net/minecraft/client/realms/gui/screen/RealmsPlayerScreen.mapping index f16ff5a727..07ae40587a 100644 --- a/mappings/net/minecraft/client/realms/gui/screen/RealmsPlayerScreen.mapping +++ b/mappings/net/minecraft/client/realms/gui/screen/RealmsPlayerScreen.mapping @@ -4,6 +4,9 @@ CLASS net/minecraft/class_4406 net/minecraft/client/realms/gui/screen/RealmsPlay FIELD field_19961 serverData Lnet/minecraft/class_4877; FIELD field_19971 stateChanged Z FIELD field_44908 QUESTION_TEXT Lnet/minecraft/class_2561; + FIELD field_49460 selectionList Lnet/minecraft/class_4406$class_4407; + FIELD field_49461 TITLE Lnet/minecraft/class_2561; + FIELD field_49463 layour Lnet/minecraft/class_8132; METHOD (Lnet/minecraft/class_4388;Lnet/minecraft/class_4877;)V ARG 1 parent ARG 2 serverData diff --git a/mappings/net/minecraft/client/render/ChunkRenderingDataPreparer.mapping b/mappings/net/minecraft/client/render/ChunkRenderingDataPreparer.mapping index 71cbbca858..e2c2719ae8 100644 --- a/mappings/net/minecraft/client/render/ChunkRenderingDataPreparer.mapping +++ b/mappings/net/minecraft/client/render/ChunkRenderingDataPreparer.mapping @@ -1,4 +1,17 @@ CLASS net/minecraft/class_8679 net/minecraft/client/render/ChunkRenderingDataPreparer + CLASS class_5972 ChunkInfoList + FIELD field_29620 current [Lnet/minecraft/class_8679$class_762; + METHOD (I)V + ARG 1 size + METHOD method_34820 getInfo (Lnet/minecraft/class_846$class_851;)Lnet/minecraft/class_8679$class_762; + ARG 1 chunk + METHOD method_34821 setInfo (Lnet/minecraft/class_846$class_851;Lnet/minecraft/class_8679$class_762;)V + ARG 1 chunk + ARG 2 info + CLASS class_6600 RenderableChunks + FIELD field_34819 chunks Ljava/util/LinkedHashSet; + METHOD (I)V + ARG 1 chunkCount CLASS class_762 ChunkInfo FIELD field_4122 propagationLevel I FIELD field_4124 chunk Lnet/minecraft/class_846$class_851; @@ -20,16 +33,3 @@ CLASS net/minecraft/class_8679 net/minecraft/client/render/ChunkRenderingDataPre ARG 1 ordinal METHOD method_34816 addDirection (Lnet/minecraft/class_2350;)V ARG 1 direction - CLASS class_5972 ChunkInfoList - FIELD field_29620 current [Lnet/minecraft/class_8679$class_762; - METHOD (I)V - ARG 1 size - METHOD method_34820 getInfo (Lnet/minecraft/class_846$class_851;)Lnet/minecraft/class_8679$class_762; - ARG 1 chunk - METHOD method_34821 setInfo (Lnet/minecraft/class_846$class_851;Lnet/minecraft/class_8679$class_762;)V - ARG 1 chunk - ARG 2 info - CLASS class_6600 RenderableChunks - FIELD field_34819 chunks Ljava/util/LinkedHashSet; - METHOD (I)V - ARG 1 chunkCount diff --git a/mappings/net/minecraft/client/render/GameRenderer.mapping b/mappings/net/minecraft/client/render/GameRenderer.mapping index d111bd4ba7..6f2543c991 100644 --- a/mappings/net/minecraft/client/render/GameRenderer.mapping +++ b/mappings/net/minecraft/client/render/GameRenderer.mapping @@ -99,6 +99,8 @@ CLASS net/minecraft/class_757 net/minecraft/client/render/GameRenderer FIELD field_47130 ticks I FIELD field_47462 renderTypeBreezeWindProgram Lnet/minecraft/class_5944; FIELD field_48948 renderTypeCloudsProgram Lnet/minecraft/class_5944; + FIELD field_49567 blurPostProcessor Lnet/minecraft/class_279; + FIELD field_49568 BLUR_PROCESSOR Lnet/minecraft/class_2960; METHOD (Lnet/minecraft/class_310;Lnet/minecraft/class_759;Lnet/minecraft/class_3300;Lnet/minecraft/class_4599;)V ARG 1 client ARG 2 heldItemRenderer @@ -397,6 +399,9 @@ CLASS net/minecraft/class_757 net/minecraft/client/render/GameRenderer ARG 1 cameraPos ARG 2 interactionRange METHOD method_56846 getRenderTypeCloudsProgram ()Lnet/minecraft/class_5944; + METHOD method_57796 renderBlur (F)V + ARG 1 delta + METHOD method_57797 loadBlurPostProcessor ()V CLASS 1 METHOD method_45775 (Lnet/minecraft/class_2960;)Z ARG 0 id diff --git a/mappings/net/minecraft/client/render/block/BlockModelRenderer.mapping b/mappings/net/minecraft/client/render/block/BlockModelRenderer.mapping index 87f167adaa..599a619e86 100644 --- a/mappings/net/minecraft/client/render/block/BlockModelRenderer.mapping +++ b/mappings/net/minecraft/client/render/block/BlockModelRenderer.mapping @@ -105,6 +105,26 @@ CLASS net/minecraft/class_778 net/minecraft/client/render/block/BlockModelRender ARG 8 random ARG 9 seed ARG 11 overlay + CLASS class_4303 BrightnessCache + FIELD field_19320 enabled Z + FIELD field_19321 intCache Lit/unimi/dsi/fastutil/longs/Long2IntLinkedOpenHashMap; + FIELD field_19322 floatCache Lit/unimi/dsi/fastutil/longs/Long2FloatLinkedOpenHashMap; + METHOD method_20548 enable ()V + METHOD method_20549 getInt (Lnet/minecraft/class_2680;Lnet/minecraft/class_1920;Lnet/minecraft/class_2338;)I + ARG 1 state + ARG 2 world + ARG 3 pos + METHOD method_20550 disable ()V + METHOD method_20551 getFloat (Lnet/minecraft/class_2680;Lnet/minecraft/class_1920;Lnet/minecraft/class_2338;)F + ARG 1 state + ARG 2 blockView + ARG 3 pos + CLASS 1 + METHOD rehash (I)V + ARG 1 newN + CLASS 2 + METHOD rehash (I)V + ARG 1 newN CLASS class_779 NeighborData FIELD field_4189 nonCubicWeight Z FIELD field_4190 VALUES [Lnet/minecraft/class_778$class_779; @@ -149,23 +169,3 @@ CLASS net/minecraft/class_778 net/minecraft/client/render/block/BlockModelRender METHOD (Ljava/lang/String;ILnet/minecraft/class_2350;Z)V ARG 3 direction ARG 4 flip - CLASS class_4303 BrightnessCache - FIELD field_19320 enabled Z - FIELD field_19321 intCache Lit/unimi/dsi/fastutil/longs/Long2IntLinkedOpenHashMap; - FIELD field_19322 floatCache Lit/unimi/dsi/fastutil/longs/Long2FloatLinkedOpenHashMap; - METHOD method_20548 enable ()V - METHOD method_20549 getInt (Lnet/minecraft/class_2680;Lnet/minecraft/class_1920;Lnet/minecraft/class_2338;)I - ARG 1 state - ARG 2 world - ARG 3 pos - METHOD method_20550 disable ()V - METHOD method_20551 getFloat (Lnet/minecraft/class_2680;Lnet/minecraft/class_1920;Lnet/minecraft/class_2338;)F - ARG 1 state - ARG 2 blockView - ARG 3 pos - CLASS 1 - METHOD rehash (I)V - ARG 1 newN - CLASS 2 - METHOD rehash (I)V - ARG 1 newN diff --git a/mappings/net/minecraft/client/render/chunk/ChunkBuilder.mapping b/mappings/net/minecraft/client/render/chunk/ChunkBuilder.mapping index 83c1274eb7..6cf3426913 100644 --- a/mappings/net/minecraft/client/render/chunk/ChunkBuilder.mapping +++ b/mappings/net/minecraft/client/render/chunk/ChunkBuilder.mapping @@ -48,6 +48,7 @@ CLASS net/minecraft/class_846 net/minecraft/client/render/chunk/ChunkBuilder METHOD method_38555 (Ljava/util/concurrent/CompletableFuture;)Ljava/util/concurrent/CompletionStage; ARG 0 future METHOD method_39132 pollTask ()Lnet/minecraft/class_846$class_851$class_4577; + CLASS class_4690 Result CLASS class_849 ChunkData FIELD field_4450 nonEmptyLayers Ljava/util/Set; FIELD field_4451 EMPTY Lnet/minecraft/class_846$class_849; @@ -171,4 +172,3 @@ CLASS net/minecraft/class_846 net/minecraft/client/render/chunk/ChunkBuilder ARG 2 throwable METHOD method_22790 (Ljava/lang/Void;)Lnet/minecraft/class_846$class_4690; ARG 0 v - CLASS class_4690 Result diff --git a/mappings/net/minecraft/client/render/model/json/JsonUnbakedModel.mapping b/mappings/net/minecraft/client/render/model/json/JsonUnbakedModel.mapping index af50e878fa..dd90fefa39 100644 --- a/mappings/net/minecraft/client/render/model/json/JsonUnbakedModel.mapping +++ b/mappings/net/minecraft/client/render/model/json/JsonUnbakedModel.mapping @@ -63,6 +63,21 @@ CLASS net/minecraft/class_793 net/minecraft/client/render/model/json/JsonUnbaked METHOD method_35789 needsResolution ()Z METHOD method_45786 (Ljava/util/function/Function;Lnet/minecraft/class_799;)V ARG 2 override + CLASS class_4751 GuiLight + FIELD field_21858 ITEM Lnet/minecraft/class_793$class_4751; + COMMENT The model will be shaded from the front, like a basic item + FIELD field_21859 BLOCK Lnet/minecraft/class_793$class_4751; + COMMENT The model will be shaded from the side, like a block. + FIELD field_21860 name Ljava/lang/String; + METHOD (Ljava/lang/String;ILjava/lang/String;)V + ARG 3 name + METHOD method_24299 isSide ()Z + METHOD method_24300 byName (Ljava/lang/String;)Lnet/minecraft/class_793$class_4751; + ARG 0 value + CLASS class_6246 UncheckedModelException + COMMENT An unused unchecked exception. Probably related to unbaked models. + METHOD (Ljava/lang/String;)V + ARG 1 message CLASS class_795 Deserializer METHOD deserialize (Lcom/google/gson/JsonElement;Ljava/lang/reflect/Type;Lcom/google/gson/JsonDeserializationContext;)Ljava/lang/Object; ARG 1 element @@ -83,18 +98,3 @@ CLASS net/minecraft/class_793 net/minecraft/client/render/model/json/JsonUnbaked ARG 2 object METHOD method_3453 ambientOcclusionFromJson (Lcom/google/gson/JsonObject;)Ljava/lang/Boolean; ARG 1 json - CLASS class_4751 GuiLight - FIELD field_21858 ITEM Lnet/minecraft/class_793$class_4751; - COMMENT The model will be shaded from the front, like a basic item - FIELD field_21859 BLOCK Lnet/minecraft/class_793$class_4751; - COMMENT The model will be shaded from the side, like a block. - FIELD field_21860 name Ljava/lang/String; - METHOD (Ljava/lang/String;ILjava/lang/String;)V - ARG 3 name - METHOD method_24299 isSide ()Z - METHOD method_24300 byName (Ljava/lang/String;)Lnet/minecraft/class_793$class_4751; - ARG 0 value - CLASS class_6246 UncheckedModelException - COMMENT An unused unchecked exception. Probably related to unbaked models. - METHOD (Ljava/lang/String;)V - ARG 1 message diff --git a/mappings/net/minecraft/client/render/model/json/ModelOverride.mapping b/mappings/net/minecraft/client/render/model/json/ModelOverride.mapping index f623cbb50e..f40af007a7 100644 --- a/mappings/net/minecraft/client/render/model/json/ModelOverride.mapping +++ b/mappings/net/minecraft/client/render/model/json/ModelOverride.mapping @@ -6,6 +6,14 @@ CLASS net/minecraft/class_799 net/minecraft/client/render/model/json/ModelOverri ARG 2 conditions METHOD method_33690 streamConditions ()Ljava/util/stream/Stream; METHOD method_3472 getModelId ()Lnet/minecraft/class_2960; + CLASS class_5826 Condition + FIELD field_28790 type Lnet/minecraft/class_2960; + FIELD field_28791 threshold F + METHOD (Lnet/minecraft/class_2960;F)V + ARG 1 type + ARG 2 threshold + METHOD method_33692 getType ()Lnet/minecraft/class_2960; + METHOD method_33693 getThreshold ()F CLASS class_800 Deserializer METHOD deserialize (Lcom/google/gson/JsonElement;Ljava/lang/reflect/Type;Lcom/google/gson/JsonDeserializationContext;)Ljava/lang/Object; ARG 1 functionJson @@ -15,11 +23,3 @@ CLASS net/minecraft/class_799 net/minecraft/client/render/model/json/ModelOverri ARG 0 entry METHOD method_3474 deserializeMinPropertyValues (Lcom/google/gson/JsonObject;)Ljava/util/List; ARG 1 object - CLASS class_5826 Condition - FIELD field_28790 type Lnet/minecraft/class_2960; - FIELD field_28791 threshold F - METHOD (Lnet/minecraft/class_2960;F)V - ARG 1 type - ARG 2 threshold - METHOD method_33692 getType ()Lnet/minecraft/class_2960; - METHOD method_33693 getThreshold ()F diff --git a/mappings/net/minecraft/client/render/model/json/ModelVariantMap.mapping b/mappings/net/minecraft/client/render/model/json/ModelVariantMap.mapping index 36fe96dcdf..9b5ba410ab 100644 --- a/mappings/net/minecraft/client/render/model/json/ModelVariantMap.mapping +++ b/mappings/net/minecraft/client/render/model/json/ModelVariantMap.mapping @@ -33,6 +33,8 @@ CLASS net/minecraft/class_790 net/minecraft/client/render/model/json/ModelVarian METHOD method_45787 fromJson (Lnet/minecraft/class_790$class_791;Lcom/google/gson/JsonElement;)Lnet/minecraft/class_790; ARG 0 context ARG 1 json + CLASS class_6247 VariantAbsentException + COMMENT An unchecked exception indicating a variant is not found with a string key. CLASS class_791 DeserializationContext FIELD field_4242 stateFactory Lnet/minecraft/class_2689; FIELD field_4243 gson Lcom/google/gson/Gson; @@ -50,5 +52,3 @@ CLASS net/minecraft/class_790 net/minecraft/client/render/model/json/ModelVarian METHOD method_3429 variantsFromJson (Lcom/google/gson/JsonDeserializationContext;Lcom/google/gson/JsonObject;)Ljava/util/Map; ARG 1 context ARG 2 object - CLASS class_6247 VariantAbsentException - COMMENT An unchecked exception indicating a variant is not found with a string key. diff --git a/mappings/net/minecraft/loot/function/ApplyBonusLootFunction.mapping b/mappings/net/minecraft/loot/function/ApplyBonusLootFunction.mapping index 1d2efae857..8b096928f3 100644 --- a/mappings/net/minecraft/loot/function/ApplyBonusLootFunction.mapping +++ b/mappings/net/minecraft/loot/function/ApplyBonusLootFunction.mapping @@ -36,6 +36,14 @@ CLASS net/minecraft/class_94 net/minecraft/loot/function/ApplyBonusLootFunction ARG 0 instance METHOD method_53302 (Lnet/minecraft/class_94;)Lnet/minecraft/class_6880; ARG 0 function + CLASS class_100 UniformBonusCount + FIELD field_45813 CODEC Lcom/mojang/serialization/Codec; + FIELD field_45814 TYPE Lnet/minecraft/class_94$class_8752; + METHOD (I)V + ARG 1 bonusMultiplier + METHOD method_53308 (Lcom/mojang/serialization/codecs/RecordCodecBuilder$Instance;)Lcom/mojang/datafixers/kinds/App; + ARG 0 instance + CLASS class_8752 Type CLASS class_95 BinomialWithBonusCount FIELD comp_1848 extra I FIELD field_1013 TYPE Lnet/minecraft/class_94$class_8752; @@ -55,11 +63,3 @@ CLASS net/minecraft/class_94 net/minecraft/loot/function/ApplyBonusLootFunction CLASS class_98 OreDrops FIELD field_1015 TYPE Lnet/minecraft/class_94$class_8752; FIELD field_45812 CODEC Lcom/mojang/serialization/Codec; - CLASS class_100 UniformBonusCount - FIELD field_45813 CODEC Lcom/mojang/serialization/Codec; - FIELD field_45814 TYPE Lnet/minecraft/class_94$class_8752; - METHOD (I)V - ARG 1 bonusMultiplier - METHOD method_53308 (Lcom/mojang/serialization/codecs/RecordCodecBuilder$Instance;)Lcom/mojang/datafixers/kinds/App; - ARG 0 instance - CLASS class_8752 Type diff --git a/mappings/net/minecraft/network/codec/PacketCodecs.mapping b/mappings/net/minecraft/network/codec/PacketCodecs.mapping index d45cdb31c8..ab4e3e95f3 100644 --- a/mappings/net/minecraft/network/codec/PacketCodecs.mapping +++ b/mappings/net/minecraft/network/codec/PacketCodecs.mapping @@ -225,17 +225,6 @@ CLASS net/minecraft/class_9135 net/minecraft/network/codec/PacketCodecs ARG 0 maxLength METHOD method_56896 registryCodec (Lcom/mojang/serialization/Codec;)Lnet/minecraft/class_9139; ARG 0 codec - CLASS 2 - METHOD method_56403 decode (Lio/netty/buffer/ByteBuf;)[B - ARG 1 buf - METHOD method_56404 encode (Lio/netty/buffer/ByteBuf;[B)V - ARG 1 buf - ARG 2 value - CLASS 5 - METHOD method_56899 (Ljava/lang/Object;Ljava/lang/String;)Lio/netty/handler/codec/EncoderException; - ARG 1 error - METHOD method_56900 (Lnet/minecraft/class_2520;Ljava/lang/String;)Lio/netty/handler/codec/DecoderException; - ARG 1 error CLASS 10 CLASS 15 METHOD method_56424 getIterable (Lnet/minecraft/class_9129;)Lnet/minecraft/class_2359; @@ -244,7 +233,18 @@ CLASS net/minecraft/class_9135 net/minecraft/network/codec/PacketCodecs FIELD field_48562 DIRECT_ENTRY_MARKER I METHOD method_56390 getEntries (Lnet/minecraft/class_9129;)Lnet/minecraft/class_2359; ARG 1 buf + CLASS 2 + METHOD method_56403 decode (Lio/netty/buffer/ByteBuf;)[B + ARG 1 buf + METHOD method_56404 encode (Lio/netty/buffer/ByteBuf;[B)V + ARG 1 buf + ARG 2 value CLASS 27 METHOD method_56407 read (Lio/netty/buffer/ByteBuf;)[B ARG 1 buf METHOD method_56408 write (Lio/netty/buffer/ByteBuf;[B)V + CLASS 5 + METHOD method_56899 (Ljava/lang/Object;Ljava/lang/String;)Lio/netty/handler/codec/EncoderException; + ARG 1 error + METHOD method_56900 (Lnet/minecraft/class_2520;Ljava/lang/String;)Lio/netty/handler/codec/DecoderException; + ARG 1 error