From 22d643e1135a36031bbae4a50f8b3213ae648502 Mon Sep 17 00:00:00 2001 From: Runemoro Date: Sun, 1 Sep 2019 11:22:10 -0400 Subject: [PATCH] A few client mappings (#833) * A few client mappings * More client mappings * Update TitleScreen.mapping * Drop things that are gone --- .../advancement/AdvancementManager.mapping | 4 + .../minecraft/client/MinecraftClient.mapping | 4 +- .../client/color/block/BlockColors.mapping | 11 ++- .../client/font/UnicodeTextureFont.mapping | 11 ++- .../client/gl/GlProgramManager.mapping | 1 + .../net/minecraft/client/gl/GlUniform.mapping | 3 + .../client/gui/DrawableHelper.mapping | 8 +- .../minecraft/client/gui/hud/ChatHud.mapping | 6 +- .../client/gui/hud/ChatHudLine.mapping | 6 +- .../minecraft/client/gui/hud/DebugHud.mapping | 8 ++ .../client/gui/hud/InGameHud.mapping | 13 +++- .../client/gui/hud/SpectatorHud.mapping | 8 +- .../gui/hud/spectator/SpectatorMenu.mapping | 3 +- .../gui/screen/AccessibilityScreen.mapping | 1 + .../client/gui/screen/AddServerScreen.mapping | 4 +- .../gui/screen/ChatOptionsScreen.mapping | 1 + .../client/gui/screen/CreditsScreen.mapping | 23 ++++++ .../screen/CustomizeFlatLevelScreen.mapping | 5 ++ .../client/gui/screen/DeathScreen.mapping | 4 + .../gui/screen/EndCreditsScreen.mapping | 15 ---- .../client/gui/screen/SplashScreen.mapping | 3 + .../client/gui/screen/StatsScreen.mapping | 76 +++++++++++++++++-- .../client/gui/screen/TitleScreen.mapping | 2 + .../screen/advancement/AdvancementTab.mapping | 60 +++++++++++++++ .../advancement/AdvancementTabType.mapping | 21 +++++ .../advancement/AdvancementTreeWidget.mapping | 17 ----- .../advancement/AdvancementWidget.mapping | 29 ++++++- .../advancement/AdvancementsScreen.mapping | 8 +- .../multiplayer/MultiplayerScreen.mapping | 4 +- .../MultiplayerServerListWidget.mapping | 32 ++++++-- .../recipebook/AnimatedResultButton.mapping | 2 + .../recipebook/RecipeAlternatesWidget.mapping | 7 ++ .../RecipeGroupButtonWidget.mapping | 2 + .../recipebook/RecipeResultCollection.mapping | 20 +++-- .../ResourcePackListWidget.mapping | 8 +- .../ResourcePackOptionsScreen.mapping | 8 +- .../screen/world/CreateWorldScreen.mapping | 13 +++- .../gui/screen/world/WorldListWidget.mapping | 2 +- .../gui/widget/AbstractButtonWidget.mapping | 2 + .../client/gui/widget/TextFieldWidget.mapping | 49 ++++++++++-- .../net/minecraft/client/input/Input.mapping | 1 + .../net/minecraft/client/main/Main.mapping | 2 + ...verEntry.mapping => LanServerInfo.mapping} | 2 +- .../ServerInfo.mapping} | 2 +- .../client/options/DoubleOption.mapping | 10 ++- .../client/options/GameOptions.mapping | 2 + .../client/options/ServerList.mapping | 2 +- .../client/particle/Particle.mapping | 2 + .../client/particle/ParticleManager.mapping | 4 + .../ClientResourcePackCreator.mapping | 2 + .../client/search/SuffixArray.mapping | 13 +++- .../sound/AbstractBeeSoundInstance.mapping | 5 ++ .../client/sound/SoundManager.mapping | 3 + .../client/sound/SoundSystem.mapping | 3 + .../client/texture/NativeImage.mapping | 1 + .../client/texture/SpriteAtlasTexture.mapping | 3 + .../client/texture/TextureStitcher.mapping | 5 +- .../TextureStitcherCannotFitException.mapping | 5 ++ .../FindTreeTutorialStepHandler.mapping | 10 ++- .../client/tutorial/TutorialManager.mapping | 3 + .../tutorial/TutorialStepHandler.mapping | 4 + .../minecraft/client/util/GlfwUtil.mapping | 1 + .../minecraft/client/util/InputUtil.mapping | 6 ++ .../client/util/NarratorManager.mapping | 1 + .../net/minecraft/client/util/PngFile.mapping | 9 +++ .../client/util/ScreenshotUtils.mapping | 17 +++++ .../client/util/math/Vector3f.mapping | 1 + .../client/world/ClientChunkManager.mapping | 33 ++++++-- .../client/world/ClientWorld.mapping | 1 + mappings/net/minecraft/world/World.mapping | 2 +- .../world/chunk/ChunkManager.mapping | 2 +- 71 files changed, 547 insertions(+), 114 deletions(-) create mode 100644 mappings/net/minecraft/client/gui/screen/CreditsScreen.mapping delete mode 100644 mappings/net/minecraft/client/gui/screen/EndCreditsScreen.mapping create mode 100644 mappings/net/minecraft/client/gui/screen/advancement/AdvancementTab.mapping delete mode 100644 mappings/net/minecraft/client/gui/screen/advancement/AdvancementTreeWidget.mapping rename mappings/net/minecraft/client/network/{LanServerEntry.mapping => LanServerInfo.mapping} (97%) rename mappings/net/minecraft/client/{options/ServerEntry.mapping => network/ServerInfo.mapping} (94%) diff --git a/mappings/net/minecraft/advancement/AdvancementManager.mapping b/mappings/net/minecraft/advancement/AdvancementManager.mapping index 97ccc80d66..3ef3f8bab7 100644 --- a/mappings/net/minecraft/advancement/AdvancementManager.mapping +++ b/mappings/net/minecraft/advancement/AdvancementManager.mapping @@ -1,10 +1,14 @@ CLASS net/minecraft/class_163 net/minecraft/advancement/AdvancementManager CLASS class_164 Listener METHOD method_719 onDependentRemoved (Lnet/minecraft/class_161;)V + ARG 1 dependent METHOD method_720 onRootRemoved (Lnet/minecraft/class_161;)V + ARG 1 root METHOD method_721 onDependentAdded (Lnet/minecraft/class_161;)V + ARG 1 dependent METHOD method_722 onClear ()V METHOD method_723 onRootAdded (Lnet/minecraft/class_161;)V + ARG 1 root FIELD field_1154 roots Ljava/util/Set; FIELD field_1155 listener Lnet/minecraft/class_163$class_164; FIELD field_1156 dependents Ljava/util/Set; diff --git a/mappings/net/minecraft/client/MinecraftClient.mapping b/mappings/net/minecraft/client/MinecraftClient.mapping index 43cd607a48..63cd96c670 100644 --- a/mappings/net/minecraft/client/MinecraftClient.mapping +++ b/mappings/net/minecraft/client/MinecraftClient.mapping @@ -13,7 +13,7 @@ CLASS net/minecraft/class_310 net/minecraft/client/MinecraftClient FIELD field_1695 windowFocused Z FIELD field_1696 thread Ljava/lang/Thread; FIELD field_1697 runDirectory Ljava/io/File; - FIELD field_1698 isRunning Z + FIELD field_1698 running Z FIELD field_1699 currentServerEntry Lnet/minecraft/class_642; FIELD field_1700 instance Lnet/minecraft/class_310; FIELD field_1701 openProfilerSection Ljava/lang/String; @@ -211,3 +211,5 @@ CLASS net/minecraft/class_310 net/minecraft/client/MinecraftClient METHOD method_18505 getStatusEffectSpriteManager ()Lnet/minecraft/class_4074; METHOD method_18506 getOverlay ()Lnet/minecraft/class_4071; METHOD method_20539 openPauseMenu (Z)V + METHOD method_22107 shouldRenderAsync ()Z + METHOD method_22108 isRunning ()Z diff --git a/mappings/net/minecraft/client/color/block/BlockColors.mapping b/mappings/net/minecraft/client/color/block/BlockColors.mapping index c33ac5c6c3..2da2cf97eb 100644 --- a/mappings/net/minecraft/client/color/block/BlockColors.mapping +++ b/mappings/net/minecraft/client/color/block/BlockColors.mapping @@ -1,5 +1,6 @@ CLASS net/minecraft/class_324 net/minecraft/client/color/block/BlockColors FIELD field_1995 providers Lnet/minecraft/class_2361; + FIELD field_20271 properties Ljava/util/Map; METHOD method_1684 (Lnet/minecraft/class_2680;Lnet/minecraft/class_1920;Lnet/minecraft/class_2338;I)I ARG 0 state ARG 1 view @@ -26,7 +27,7 @@ CLASS net/minecraft/class_324 net/minecraft/client/color/block/BlockColors ARG 2 pos ARG 3 tintIndex METHOD method_1689 create ()Lnet/minecraft/class_324; - METHOD method_1690 register (Lnet/minecraft/class_322;[Lnet/minecraft/class_2248;)V + METHOD method_1690 registerColorProvider (Lnet/minecraft/class_322;[Lnet/minecraft/class_2248;)V ARG 1 provider ARG 2 blocks METHOD method_1691 getColor (Lnet/minecraft/class_2680;Lnet/minecraft/class_1937;Lnet/minecraft/class_2338;)I @@ -68,3 +69,11 @@ CLASS net/minecraft/class_324 net/minecraft/client/color/block/BlockColors ARG 1 view ARG 2 pos ARG 3 tintIndex + METHOD method_21592 getProperties (Lnet/minecraft/class_2248;)Ljava/util/Set; + ARG 1 block + METHOD method_21593 registerColorProperty (Lnet/minecraft/class_2769;[Lnet/minecraft/class_2248;)V + ARG 1 property + ARG 2 blocks + METHOD method_21594 registerColorProperties (Ljava/util/Set;[Lnet/minecraft/class_2248;)V + ARG 1 properties + ARG 2 blocks diff --git a/mappings/net/minecraft/client/font/UnicodeTextureFont.mapping b/mappings/net/minecraft/client/font/UnicodeTextureFont.mapping index ee32ba6b9c..14971a368a 100644 --- a/mappings/net/minecraft/client/font/UnicodeTextureFont.mapping +++ b/mappings/net/minecraft/client/font/UnicodeTextureFont.mapping @@ -6,6 +6,7 @@ CLASS net/minecraft/class_391 net/minecraft/client/font/UnicodeTextureFont ARG 1 sizes ARG 2 template METHOD method_2046 fromJson (Lcom/google/gson/JsonObject;)Lnet/minecraft/class_389; + ARG 0 json CLASS class_393 UnicodeTextureGlyph FIELD field_2306 unpackSkipRows I FIELD field_2307 unpackSkipPixels I @@ -13,8 +14,8 @@ CLASS net/minecraft/class_391 net/minecraft/client/font/UnicodeTextureFont FIELD field_2309 width I FIELD field_2310 image Lnet/minecraft/class_1011; METHOD (IIIILnet/minecraft/class_1011;)V - ARG 1 unpackSkipPixels - ARG 2 unpackSkipRows + ARG 1 x + ARG 2 y ARG 3 width ARG 4 height ARG 5 image @@ -27,7 +28,11 @@ CLASS net/minecraft/class_391 net/minecraft/client/font/UnicodeTextureFont ARG 1 resourceManager ARG 2 sizes ARG 3 template - METHOD method_2041 getGlyphId (C)Lnet/minecraft/class_2960; + METHOD method_2041 getImageId (C)Lnet/minecraft/class_2960; ARG 1 character METHOD method_2042 getGlyphImage (Lnet/minecraft/class_2960;)Lnet/minecraft/class_1011; ARG 1 glyphId + METHOD method_2043 getStart (B)I + ARG 0 size + METHOD method_2044 getEnd (B)I + ARG 0 size diff --git a/mappings/net/minecraft/client/gl/GlProgramManager.mapping b/mappings/net/minecraft/client/gl/GlProgramManager.mapping index 279846c803..dc038eb1ac 100644 --- a/mappings/net/minecraft/client/gl/GlProgramManager.mapping +++ b/mappings/net/minecraft/client/gl/GlProgramManager.mapping @@ -3,3 +3,4 @@ CLASS net/minecraft/class_285 net/minecraft/client/gl/GlProgramManager METHOD method_1304 deleteProgram (Lnet/minecraft/class_3679;)V METHOD method_1306 createProgram ()I METHOD method_1307 linkProgram (Lnet/minecraft/class_3679;)V + METHOD method_22094 useProgram (I)V diff --git a/mappings/net/minecraft/client/gl/GlUniform.mapping b/mappings/net/minecraft/client/gl/GlUniform.mapping index 3d65937e06..6c9b109882 100644 --- a/mappings/net/minecraft/client/gl/GlUniform.mapping +++ b/mappings/net/minecraft/client/gl/GlUniform.mapping @@ -22,3 +22,6 @@ CLASS net/minecraft/class_284 net/minecraft/client/gl/GlUniform METHOD method_1301 uploadFloats ()V METHOD method_1302 markStateDirty ()V METHOD method_1303 uploadInts ()V + METHOD method_22095 uniform1 (II)V + METHOD method_22096 getUniformLocation (ILjava/lang/CharSequence;)I + METHOD method_22097 getAttribLocation (ILjava/lang/CharSequence;)I diff --git a/mappings/net/minecraft/client/gui/DrawableHelper.mapping b/mappings/net/minecraft/client/gui/DrawableHelper.mapping index 08cb13d11f..02b8a75c4f 100644 --- a/mappings/net/minecraft/client/gui/DrawableHelper.mapping +++ b/mappings/net/minecraft/client/gui/DrawableHelper.mapping @@ -62,10 +62,10 @@ CLASS net/minecraft/class_332 net/minecraft/client/gui/DrawableHelper ARG 4 y ARG 5 color METHOD fill (IIIII)V - ARG 0 left - ARG 1 top - ARG 2 right - ARG 3 bottom + ARG 0 x1 + ARG 1 y1 + ARG 2 x2 + ARG 3 y2 ARG 4 color METHOD fillGradient (IIIIII)V ARG 1 top diff --git a/mappings/net/minecraft/client/gui/hud/ChatHud.mapping b/mappings/net/minecraft/client/gui/hud/ChatHud.mapping index 09b5849d43..19dd5eae1e 100644 --- a/mappings/net/minecraft/client/gui/hud/ChatHud.mapping +++ b/mappings/net/minecraft/client/gui/hud/ChatHud.mapping @@ -5,6 +5,7 @@ CLASS net/minecraft/class_338 net/minecraft/client/gui/hud/ChatHud FIELD field_2064 visibleMessages Ljava/util/List; FIELD field_2065 LOGGER Lorg/apache/logging/log4j/Logger; FIELD field_2066 scrolledLines I + FIELD field_2067 hasUnreadNewMessages Z METHOD (Lnet/minecraft/class_310;)V ARG 1 client METHOD method_1802 scroll (D)V @@ -15,7 +16,7 @@ CLASS net/minecraft/class_338 net/minecraft/client/gui/hud/ChatHud ARG 1 message ARG 2 messageId METHOD method_1805 render (I)V - ARG 1 timestamp + ARG 1 ticks METHOD method_1806 getWidth (D)I ARG 0 widthOption METHOD method_1807 removeMessage (I)V @@ -40,3 +41,6 @@ CLASS net/minecraft/class_338 net/minecraft/client/gui/hud/ChatHud METHOD method_1818 getHeight (D)I ARG 0 heightOption METHOD method_1819 isChatFocused ()Z + METHOD method_1820 resetScroll ()V + METHOD method_19348 getMessageOpacityMultiplier (I)D + ARG 0 age diff --git a/mappings/net/minecraft/client/gui/hud/ChatHudLine.mapping b/mappings/net/minecraft/client/gui/hud/ChatHudLine.mapping index 9ce0a05d96..bcc142d877 100644 --- a/mappings/net/minecraft/client/gui/hud/ChatHudLine.mapping +++ b/mappings/net/minecraft/client/gui/hud/ChatHudLine.mapping @@ -1,11 +1,11 @@ CLASS net/minecraft/class_303 net/minecraft/client/gui/hud/ChatHudLine FIELD field_1649 id I - FIELD field_1650 timestamp I + FIELD field_1650 creationTick I FIELD field_1651 text Lnet/minecraft/class_2561; METHOD (ILnet/minecraft/class_2561;I)V - ARG 1 timestamp + ARG 1 creationTick ARG 2 text ARG 3 id METHOD method_1412 getText ()Lnet/minecraft/class_2561; METHOD method_1413 getId ()I - METHOD method_1414 getTimestamp ()I + METHOD method_1414 getCreationTick ()I diff --git a/mappings/net/minecraft/client/gui/hud/DebugHud.mapping b/mappings/net/minecraft/client/gui/hud/DebugHud.mapping index 9e2a765e10..33fb7479b3 100644 --- a/mappings/net/minecraft/client/gui/hud/DebugHud.mapping +++ b/mappings/net/minecraft/client/gui/hud/DebugHud.mapping @@ -13,9 +13,16 @@ CLASS net/minecraft/class_340 net/minecraft/client/gui/hud/DebugHud ARG 2 startY ARG 3 firstSample ARG 4 isClient + METHOD method_1833 getMetricsLineColor (IIII)I + ARG 1 value + ARG 2 greenValue + ARG 3 yellowValue + ARG 4 redValue METHOD method_1834 getChunk ()Lnet/minecraft/class_2818; METHOD method_1835 getLeftText ()Ljava/util/List; METHOD method_1836 getClientChunk ()Lnet/minecraft/class_2818; + METHOD method_1838 toMiB (J)J + ARG 0 bytes METHOD method_1839 getRightText ()Ljava/util/List; METHOD method_1840 getWorld ()Lnet/minecraft/class_1937; METHOD method_1842 resetChunk ()V @@ -28,3 +35,4 @@ CLASS net/minecraft/class_340 net/minecraft/client/gui/hud/DebugHud METHOD method_1846 render ()V METHOD method_1847 renderLeftText ()V METHOD method_1848 renderRightText ()V + METHOD method_20603 getServerWorldDebugString ()Ljava/lang/String; diff --git a/mappings/net/minecraft/client/gui/hud/InGameHud.mapping b/mappings/net/minecraft/client/gui/hud/InGameHud.mapping index 8592f1584b..162714ef18 100644 --- a/mappings/net/minecraft/client/gui/hud/InGameHud.mapping +++ b/mappings/net/minecraft/client/gui/hud/InGameHud.mapping @@ -1,5 +1,6 @@ CLASS net/minecraft/class_329 net/minecraft/client/gui/hud/InGameHud FIELD field_2011 scaledWidth I + FIELD field_2013 vignetteDarkness F FIELD field_2015 playerListHud Lnet/minecraft/class_355; FIELD field_2016 title Ljava/lang/String; FIELD field_2017 titleRemainTicks I @@ -28,17 +29,23 @@ CLASS net/minecraft/class_329 net/minecraft/client/gui/hud/InGameHud FIELD field_2042 ticks I METHOD (Lnet/minecraft/class_310;)V ARG 1 client + METHOD method_1731 updateVignetteDarkness (Lnet/minecraft/class_1297;)V + ARG 1 entity METHOD method_1732 setRecordPlayingOverlay (Ljava/lang/String;)V + METHOD method_1733 getHeartRows (I)I + ARG 1 heartCount METHOD method_1734 getRiddenEntity ()Lnet/minecraft/class_1309; METHOD method_1735 renderVignetteOverlay (Lnet/minecraft/class_1297;)V METHOD method_1736 renderCrosshair ()V METHOD method_1737 getCameraPlayer ()Lnet/minecraft/class_1657; METHOD method_1738 getTicks ()I - METHOD method_1739 getSpectatorWidget ()Lnet/minecraft/class_365; + METHOD method_1739 getSpectatorHud ()Lnet/minecraft/class_365; METHOD method_1740 getBossBarHud ()Lnet/minecraft/class_337; METHOD method_1741 renderMountHealth ()V METHOD method_1742 setDefaultTitleFade ()V METHOD method_1743 getChatHud ()Lnet/minecraft/class_338; + METHOD method_1744 getHeartCount (Lnet/minecraft/class_1309;)I + ARG 1 entity METHOD method_1745 resetDebugHudChunk ()V METHOD method_1746 renderPortalOverlay (F)V METHOD method_1747 clear ()V @@ -62,3 +69,7 @@ CLASS net/minecraft/class_329 net/minecraft/client/gui/hud/InGameHud METHOD method_1764 setOverlayMessage (Ljava/lang/String;Z)V METHOD method_1765 renderStatusEffectOverlay ()V METHOD method_1766 renderDemoTimer ()V + METHOD method_19346 drawTextBackground (Lnet/minecraft/class_327;II)V + ARG 1 textRenderer + ARG 2 y + ARG 3 width diff --git a/mappings/net/minecraft/client/gui/hud/SpectatorHud.mapping b/mappings/net/minecraft/client/gui/hud/SpectatorHud.mapping index f150e9a577..b94f06aa21 100644 --- a/mappings/net/minecraft/client/gui/hud/SpectatorHud.mapping +++ b/mappings/net/minecraft/client/gui/hud/SpectatorHud.mapping @@ -1,6 +1,6 @@ CLASS net/minecraft/class_365 net/minecraft/client/gui/hud/SpectatorHud FIELD field_2197 WIDGETS_TEX Lnet/minecraft/class_2960; - FIELD field_2198 lastKeyPressTime J + FIELD field_2198 lastInteractionTime J FIELD field_2199 SPECTATOR_TEX Lnet/minecraft/class_2960; FIELD field_2200 spectatorMenu Lnet/minecraft/class_531; FIELD field_2201 client Lnet/minecraft/class_310; @@ -10,11 +10,14 @@ CLASS net/minecraft/class_365 net/minecraft/client/gui/hud/SpectatorHud ARG 1 height ARG 2 x ARG 4 state - METHOD method_1977 onHotbarKeyPress (I)V + METHOD method_1976 cycleSlot (D)V + ARG 1 offset + METHOD method_1977 selectSlot (I)V ARG 1 slot METHOD method_1978 render (F)V ARG 1 tickDelta METHOD method_1979 render ()V + METHOD method_1980 isOpen ()Z METHOD method_1981 getSpectatorMenuHeight ()F METHOD method_1982 renderSpectatorCommand (IIFFLnet/minecraft/class_537;)V ARG 1 slot @@ -22,3 +25,4 @@ CLASS net/minecraft/class_365 net/minecraft/client/gui/hud/SpectatorHud ARG 3 y ARG 4 alpha ARG 5 command + METHOD method_1983 useSelectedCommand ()V diff --git a/mappings/net/minecraft/client/gui/hud/spectator/SpectatorMenu.mapping b/mappings/net/minecraft/client/gui/hud/spectator/SpectatorMenu.mapping index 548921da0a..c5f0b2a414 100644 --- a/mappings/net/minecraft/client/gui/hud/spectator/SpectatorMenu.mapping +++ b/mappings/net/minecraft/client/gui/hud/spectator/SpectatorMenu.mapping @@ -19,7 +19,8 @@ CLASS net/minecraft/class_531 net/minecraft/client/gui/hud/spectator/SpectatorMe METHOD (Lnet/minecraft/class_536;)V ARG 1 closeCallback METHOD method_2770 getCommands ()Ljava/util/List; - METHOD method_2771 setSelectedSlot (I)V + METHOD method_2771 useCommand (I)V + ARG 1 slot METHOD method_2772 getCurrentState ()Lnet/minecraft/class_539; METHOD method_2773 getSelectedSlot ()I METHOD method_2774 getSelectedCommand ()Lnet/minecraft/class_537; diff --git a/mappings/net/minecraft/client/gui/screen/AccessibilityScreen.mapping b/mappings/net/minecraft/client/gui/screen/AccessibilityScreen.mapping index c517f431d5..68890a36d2 100644 --- a/mappings/net/minecraft/client/gui/screen/AccessibilityScreen.mapping +++ b/mappings/net/minecraft/client/gui/screen/AccessibilityScreen.mapping @@ -6,6 +6,7 @@ CLASS net/minecraft/class_4189 net/minecraft/client/gui/screen/AccessibilityScre METHOD (Lnet/minecraft/class_437;Lnet/minecraft/class_315;)V ARG 1 parent ARG 2 gameOptions + METHOD method_19366 setNarratorMessage ()V METHOD render (IIF)V ARG 1 mouseX ARG 2 mouseY diff --git a/mappings/net/minecraft/client/gui/screen/AddServerScreen.mapping b/mappings/net/minecraft/client/gui/screen/AddServerScreen.mapping index 968db0df9a..79dd5c898b 100644 --- a/mappings/net/minecraft/client/gui/screen/AddServerScreen.mapping +++ b/mappings/net/minecraft/client/gui/screen/AddServerScreen.mapping @@ -1,6 +1,6 @@ CLASS net/minecraft/class_422 net/minecraft/client/gui/screen/AddServerScreen FIELD field_19236 callback Lit/unimi/dsi/fastutil/booleans/BooleanConsumer; - FIELD field_2469 serverEntry Lnet/minecraft/class_642; + FIELD field_2469 server Lnet/minecraft/class_642; FIELD field_2471 serverNameField Lnet/minecraft/class_342; FIELD field_2472 buttonAdd Lnet/minecraft/class_4185; FIELD field_2473 resourcePackOptionButton Lnet/minecraft/class_4185; @@ -8,7 +8,7 @@ CLASS net/minecraft/class_422 net/minecraft/client/gui/screen/AddServerScreen FIELD field_2475 addressTextFilter Ljava/util/function/Predicate; METHOD (Lit/unimi/dsi/fastutil/booleans/BooleanConsumer;Lnet/minecraft/class_642;)V ARG 1 callback - ARG 2 serverEntry + ARG 2 server METHOD method_2171 onClose (Ljava/lang/String;)V ARG 1 text METHOD method_2172 addAndClose ()V diff --git a/mappings/net/minecraft/client/gui/screen/ChatOptionsScreen.mapping b/mappings/net/minecraft/client/gui/screen/ChatOptionsScreen.mapping index dadbc59135..9367f86d26 100644 --- a/mappings/net/minecraft/client/gui/screen/ChatOptionsScreen.mapping +++ b/mappings/net/minecraft/client/gui/screen/ChatOptionsScreen.mapping @@ -6,6 +6,7 @@ CLASS net/minecraft/class_404 net/minecraft/client/gui/screen/ChatOptionsScreen METHOD (Lnet/minecraft/class_437;Lnet/minecraft/class_315;)V ARG 1 parent ARG 2 options + METHOD method_2096 setNarratorMessage ()V METHOD render (IIF)V ARG 1 mouseX ARG 2 mouseY diff --git a/mappings/net/minecraft/client/gui/screen/CreditsScreen.mapping b/mappings/net/minecraft/client/gui/screen/CreditsScreen.mapping new file mode 100644 index 0000000000..ab3c3acb26 --- /dev/null +++ b/mappings/net/minecraft/client/gui/screen/CreditsScreen.mapping @@ -0,0 +1,23 @@ +CLASS net/minecraft/class_445 net/minecraft/client/gui/screen/CreditsScreen + FIELD field_2626 MINECRAFT_TITLE_TEXTURE Lnet/minecraft/class_2960; + FIELD field_2627 endCredits Z + FIELD field_2628 time F + FIELD field_2629 creditsHeight I + FIELD field_2630 finishAction Ljava/lang/Runnable; + FIELD field_2631 EDITION_TITLE_TEXTURE Lnet/minecraft/class_2960; + FIELD field_2632 LOGGER Lorg/apache/logging/log4j/Logger; + FIELD field_2633 VIGNETTE_TEXTURE Lnet/minecraft/class_2960; + FIELD field_2634 credits Ljava/util/List; + FIELD field_2635 speed F + METHOD (ZLjava/lang/Runnable;)V + ARG 1 endCredits + ARG 2 finishAction + METHOD method_2257 close ()V + METHOD method_2258 renderBackground (IIF)V + ARG 1 mouseX + ARG 2 mouseY + ARG 3 tickDelta + METHOD render (IIF)V + ARG 1 mouseX + ARG 2 mouseY + ARG 3 delta diff --git a/mappings/net/minecraft/client/gui/screen/CustomizeFlatLevelScreen.mapping b/mappings/net/minecraft/client/gui/screen/CustomizeFlatLevelScreen.mapping index 30f802e485..6ccf52498a 100644 --- a/mappings/net/minecraft/client/gui/screen/CustomizeFlatLevelScreen.mapping +++ b/mappings/net/minecraft/client/gui/screen/CustomizeFlatLevelScreen.mapping @@ -15,6 +15,11 @@ CLASS net/minecraft/class_413 net/minecraft/client/gui/screen/CustomizeFlatLevel ARG 1 parent ARG 2 generatorOptions METHOD method_2138 getConfigString ()Ljava/lang/String; + METHOD method_2139 setConfigString (Ljava/lang/String;)V + ARG 1 config + METHOD method_2140 getConfigTag ()Lnet/minecraft/class_2487; + METHOD method_2144 setConfigTag (Lnet/minecraft/class_2487;)V + ARG 1 config METHOD render (IIF)V ARG 1 mouseX ARG 2 mouseY diff --git a/mappings/net/minecraft/client/gui/screen/DeathScreen.mapping b/mappings/net/minecraft/client/gui/screen/DeathScreen.mapping index 7ea45d3f08..915a6fe139 100644 --- a/mappings/net/minecraft/client/gui/screen/DeathScreen.mapping +++ b/mappings/net/minecraft/client/gui/screen/DeathScreen.mapping @@ -5,6 +5,10 @@ CLASS net/minecraft/class_418 net/minecraft/client/gui/screen/DeathScreen METHOD (Lnet/minecraft/class_2561;Z)V ARG 1 message ARG 2 isHardcore + METHOD method_20373 onConfirmQuit (Z)V + ARG 1 quit + METHOD method_2164 getTextComponentUnderMouse (I)Lnet/minecraft/class_2561; + ARG 1 mouseX METHOD mouseClicked (DDI)Z ARG 1 mouseX ARG 3 mouseY diff --git a/mappings/net/minecraft/client/gui/screen/EndCreditsScreen.mapping b/mappings/net/minecraft/client/gui/screen/EndCreditsScreen.mapping deleted file mode 100644 index a50e0d1564..0000000000 --- a/mappings/net/minecraft/client/gui/screen/EndCreditsScreen.mapping +++ /dev/null @@ -1,15 +0,0 @@ -CLASS net/minecraft/class_445 net/minecraft/client/gui/screen/EndCreditsScreen - FIELD field_2626 MINECRAFT_TITLE_TEXTURE Lnet/minecraft/class_2960; - FIELD field_2627 inGame Z - FIELD field_2630 respawn Ljava/lang/Runnable; - FIELD field_2631 EDITION_TITLE_TEXTURE Lnet/minecraft/class_2960; - FIELD field_2632 LOGGER Lorg/apache/logging/log4j/Logger; - FIELD field_2633 VIGNETTE_TEXTURE Lnet/minecraft/class_2960; - METHOD (ZLjava/lang/Runnable;)V - ARG 1 inGame - ARG 2 respawn - METHOD method_2257 respawn ()V - METHOD render (IIF)V - ARG 1 mouseX - ARG 2 mouseY - ARG 3 delta diff --git a/mappings/net/minecraft/client/gui/screen/SplashScreen.mapping b/mappings/net/minecraft/client/gui/screen/SplashScreen.mapping index 0c8b193624..01ad7772a4 100644 --- a/mappings/net/minecraft/client/gui/screen/SplashScreen.mapping +++ b/mappings/net/minecraft/client/gui/screen/SplashScreen.mapping @@ -1,4 +1,5 @@ CLASS net/minecraft/class_425 net/minecraft/client/gui/screen/SplashScreen + CLASS class_4070 LogoTexture FIELD field_17767 reloadMonitor Lnet/minecraft/class_4011; FIELD field_18217 client Lnet/minecraft/class_310; FIELD field_2483 LOGO Lnet/minecraft/class_2960; @@ -9,6 +10,8 @@ CLASS net/minecraft/class_425 net/minecraft/client/gui/screen/SplashScreen ARG 4 maxY ARG 5 progress ARG 6 fadeAmount + METHOD method_18819 init (Lnet/minecraft/class_310;)V + ARG 0 client METHOD render (IIF)V ARG 1 mouseX ARG 2 mouseY diff --git a/mappings/net/minecraft/client/gui/screen/StatsScreen.mapping b/mappings/net/minecraft/client/gui/screen/StatsScreen.mapping index 0aceb22fab..9cee8c28f8 100644 --- a/mappings/net/minecraft/client/gui/screen/StatsScreen.mapping +++ b/mappings/net/minecraft/client/gui/screen/StatsScreen.mapping @@ -1,22 +1,82 @@ CLASS net/minecraft/class_447 net/minecraft/client/gui/screen/StatsScreen - CLASS class_4198 CustomStatsListWidget - CLASS class_4197 CustomStatItem + CLASS class_4198 GeneralStatsListWidget + CLASS class_4197 Entry + FIELD field_18749 stat Lnet/minecraft/class_3445; + METHOD (Lnet/minecraft/class_3445;)V + ARG 1 stat + METHOD (Lnet/minecraft/class_310;)V + ARG 1 client CLASS class_4200 ItemStatsListWidget - CLASS class_4199 ItemStatItem + CLASS class_450 ItemComparator + CLASS class_4199 Entry + METHOD method_19405 render (Lnet/minecraft/class_3445;IIZ)V + ARG 1 stat + ARG 2 x + ARG 3 y + ARG 4 light + FIELD field_18753 HEADER_ICON_SPRITE_INDICES [I + FIELD field_18754 blockStatTypes Ljava/util/List; + FIELD field_18755 itemStatTypes Ljava/util/List; + FIELD field_18756 selectedHeaderColumn I + FIELD field_18757 items Ljava/util/List; + FIELD field_18758 comparator Ljava/util/Comparator; + FIELD field_18759 selectedStatType Lnet/minecraft/class_3448; + METHOD (Lnet/minecraft/class_310;)V + ARG 1 client + METHOD method_19406 getText (Lnet/minecraft/class_1792;)Lnet/minecraft/class_2561; + ARG 1 item + METHOD method_19407 render (Lnet/minecraft/class_2561;II)V + ARG 1 text + ARG 2 x + ARG 3 y + METHOD method_19408 selectStatType (Lnet/minecraft/class_3448;)V + ARG 1 statType + METHOD method_19409 getHeaderIndex (Lnet/minecraft/class_3448;)I + ARG 1 statType + METHOD method_19410 getStatType (I)Lnet/minecraft/class_3448; + ARG 1 headerColumn METHOD renderDecorations (II)V ARG 1 mouseX ARG 2 mouseY CLASS class_4202 EntityStatsListWidget - CLASS class_4201 EntityStatItem - FIELD field_2642 itemsButton Lnet/minecraft/class_447$class_4200; - FIELD field_2643 listWidget Lnet/minecraft/class_4280; - FIELD field_2644 generalButton Lnet/minecraft/class_447$class_4198; - FIELD field_2646 mobsButton Lnet/minecraft/class_447$class_4202; + CLASS class_4201 Entry + FIELD field_18762 entityType Lnet/minecraft/class_1299; + METHOD (Lnet/minecraft/class_1299;)V + ARG 1 entityType + METHOD method_19411 getKilledString (Ljava/lang/String;I)Ljava/lang/String; + ARG 1 entityName + ARG 2 killCount + METHOD method_19412 getKilledByString (Ljava/lang/String;I)Ljava/lang/String; + ARG 1 entityName + ARG 2 killCount + METHOD (Lnet/minecraft/class_310;)V + ARG 1 client + FIELD field_2642 itemStats Lnet/minecraft/class_447$class_4200; + FIELD field_2643 selectedList Lnet/minecraft/class_4280; + FIELD field_2644 generalStats Lnet/minecraft/class_447$class_4198; + FIELD field_2645 downloadingStats Z + FIELD field_2646 mobStats Lnet/minecraft/class_447$class_4202; FIELD field_2647 statHandler Lnet/minecraft/class_3469; FIELD field_2648 parent Lnet/minecraft/class_437; METHOD (Lnet/minecraft/class_437;Lnet/minecraft/class_3469;)V ARG 1 parent ARG 2 statHandler + METHOD method_19390 selectStatList (Lnet/minecraft/class_4280;)V + ARG 1 list + METHOD method_19399 getSelectedStatList ()Lnet/minecraft/class_4280; + METHOD method_2267 createButtons ()V + METHOD method_2270 createLists ()V + METHOD method_2282 renderIcon (IIII)V + ARG 1 x + ARG 2 y + ARG 3 u + ARG 4 v + METHOD method_2285 getColumnX (I)I + ARG 1 index + METHOD method_2289 renderStatItem (IILnet/minecraft/class_1792;)V + ARG 1 x + ARG 2 y + ARG 3 item METHOD render (IIF)V ARG 1 mouseX ARG 2 mouseY diff --git a/mappings/net/minecraft/client/gui/screen/TitleScreen.mapping b/mappings/net/minecraft/client/gui/screen/TitleScreen.mapping index 00737bca18..9d3c547493 100644 --- a/mappings/net/minecraft/client/gui/screen/TitleScreen.mapping +++ b/mappings/net/minecraft/client/gui/screen/TitleScreen.mapping @@ -16,6 +16,8 @@ CLASS net/minecraft/class_442 net/minecraft/client/gui/screen/TitleScreen METHOD (Z)V ARG 1 doBackgroundFade METHOD method_18105 loadTexturesAsync (Lnet/minecraft/class_1060;Ljava/util/concurrent/Executor;)Ljava/util/concurrent/CompletableFuture; + METHOD method_20375 onDemoDeletionConfirmed (Z)V + ARG 1 delete METHOD method_2249 initWidgetsNormal (II)V ARG 1 y ARG 2 spacingY diff --git a/mappings/net/minecraft/client/gui/screen/advancement/AdvancementTab.mapping b/mappings/net/minecraft/client/gui/screen/advancement/AdvancementTab.mapping new file mode 100644 index 0000000000..f75edd04f9 --- /dev/null +++ b/mappings/net/minecraft/client/gui/screen/advancement/AdvancementTab.mapping @@ -0,0 +1,60 @@ +CLASS net/minecraft/class_454 net/minecraft/client/gui/screen/advancement/AdvancementTab + FIELD field_2680 client Lnet/minecraft/class_310; + FIELD field_2681 index I + FIELD field_2682 root Lnet/minecraft/class_161; + FIELD field_2684 type Lnet/minecraft/class_453; + FIELD field_2685 widgets Ljava/util/Map; + FIELD field_2686 title Ljava/lang/String; + FIELD field_2687 screen Lnet/minecraft/class_457; + FIELD field_2689 panY D + FIELD field_2690 panX D + FIELD field_2691 maxPanY I + FIELD field_2692 maxPanX I + FIELD field_2693 minPanY I + FIELD field_2694 minPanX I + FIELD field_2695 display Lnet/minecraft/class_185; + FIELD field_2696 rootWidget Lnet/minecraft/class_456; + FIELD field_2697 icon Lnet/minecraft/class_1799; + METHOD (Lnet/minecraft/class_310;Lnet/minecraft/class_457;Lnet/minecraft/class_453;ILnet/minecraft/class_161;Lnet/minecraft/class_185;)V + ARG 1 client + ARG 2 screen + ARG 3 type + ARG 4 index + ARG 5 root + ARG 6 display + METHOD method_2307 getRoot ()Lnet/minecraft/class_161; + METHOD method_2308 getWidget (Lnet/minecraft/class_161;)Lnet/minecraft/class_456; + ARG 1 advancement + METHOD method_2309 getTitle ()Ljava/lang/String; + METHOD method_2310 render ()V + METHOD method_2311 drawBackground (IIZ)V + ARG 1 x + ARG 2 y + ARG 3 selected + METHOD method_2312 getScreen ()Lnet/minecraft/class_457; + METHOD method_2313 move (DD)V + ARG 1 offsetX + ARG 3 offsetY + METHOD method_2314 drawWidgetTooltip (IIII)V + ARG 1 mouseX + ARG 2 mouseY + ARG 3 x + ARG 4 y + METHOD method_2315 drawIcon (IILnet/minecraft/class_918;)V + ARG 1 x + ARG 2 y + METHOD method_2316 isClickOnTab (IIDD)Z + ARG 1 screenX + ARG 2 screenY + ARG 3 mouseX + ARG 5 mouseY + METHOD method_2317 create (Lnet/minecraft/class_310;Lnet/minecraft/class_457;ILnet/minecraft/class_161;)Lnet/minecraft/class_454; + ARG 0 minecraft + ARG 1 screen + ARG 2 index + ARG 3 root + METHOD method_2318 addAdvancement (Lnet/minecraft/class_161;)V + ARG 1 advancement + METHOD method_2319 addWidget (Lnet/minecraft/class_456;Lnet/minecraft/class_161;)V + ARG 1 widget + ARG 2 advancement diff --git a/mappings/net/minecraft/client/gui/screen/advancement/AdvancementTabType.mapping b/mappings/net/minecraft/client/gui/screen/advancement/AdvancementTabType.mapping index 5c40e2dec7..b2f4d9a009 100644 --- a/mappings/net/minecraft/client/gui/screen/advancement/AdvancementTabType.mapping +++ b/mappings/net/minecraft/client/gui/screen/advancement/AdvancementTabType.mapping @@ -1,9 +1,30 @@ CLASS net/minecraft/class_453 net/minecraft/client/gui/screen/advancement/AdvancementTabType + FIELD field_2669 tabCount I + FIELD field_2670 height I + FIELD field_2671 width I + FIELD field_2672 v I + FIELD field_2674 u I + METHOD (IIIII)V + ARG 1 u + ARG 2 v + ARG 3 width + ARG 4 height + ARG 5 tabCount METHOD method_2301 drawBackground (Lnet/minecraft/class_332;IIZI)V ARG 1 drawable ARG 2 x ARG 3 y ARG 4 selected + ARG 5 index + METHOD method_2302 getTabX (I)I + METHOD method_2303 isClickOnTab (IIIDD)Z + ARG 1 screenX + ARG 2 screenY + ARG 3 index + ARG 4 mouseX + ARG 6 mouseY + METHOD method_2304 getTabCount ()I + METHOD method_2305 getTabY (I)I METHOD method_2306 drawIcon (IIILnet/minecraft/class_918;Lnet/minecraft/class_1799;)V ARG 1 x ARG 2 y diff --git a/mappings/net/minecraft/client/gui/screen/advancement/AdvancementTreeWidget.mapping b/mappings/net/minecraft/client/gui/screen/advancement/AdvancementTreeWidget.mapping deleted file mode 100644 index af78730de5..0000000000 --- a/mappings/net/minecraft/client/gui/screen/advancement/AdvancementTreeWidget.mapping +++ /dev/null @@ -1,17 +0,0 @@ -CLASS net/minecraft/class_454 net/minecraft/client/gui/screen/advancement/AdvancementTreeWidget - FIELD field_2680 client Lnet/minecraft/class_310; - FIELD field_2682 rootAdvancement Lnet/minecraft/class_161; - FIELD field_2684 tabType Lnet/minecraft/class_453; - FIELD field_2685 widgets Ljava/util/Map; - METHOD (Lnet/minecraft/class_310;Lnet/minecraft/class_457;Lnet/minecraft/class_453;ILnet/minecraft/class_161;Lnet/minecraft/class_185;)V - ARG 1 client - ARG 5 rootAdvancement - METHOD method_2308 getWidgetForAdvancement (Lnet/minecraft/class_161;)Lnet/minecraft/class_456; - METHOD method_2311 drawBackground (IIZ)V - ARG 1 x - ARG 2 y - METHOD method_2315 drawIcon (IILnet/minecraft/class_918;)V - ARG 1 x - ARG 2 y - METHOD method_2317 create (Lnet/minecraft/class_310;Lnet/minecraft/class_457;ILnet/minecraft/class_161;)Lnet/minecraft/class_454; - ARG 0 minecraft diff --git a/mappings/net/minecraft/client/gui/screen/advancement/AdvancementWidget.mapping b/mappings/net/minecraft/client/gui/screen/advancement/AdvancementWidget.mapping index 1dd7c86895..9cfcf61619 100644 --- a/mappings/net/minecraft/client/gui/screen/advancement/AdvancementWidget.mapping +++ b/mappings/net/minecraft/client/gui/screen/advancement/AdvancementWidget.mapping @@ -1,15 +1,38 @@ CLASS net/minecraft/class_456 net/minecraft/client/gui/screen/advancement/AdvancementWidget FIELD field_2702 advancement Lnet/minecraft/class_161; - FIELD field_2703 tree Lnet/minecraft/class_454; + FIELD field_2703 tab Lnet/minecraft/class_454; FIELD field_2704 client Lnet/minecraft/class_310; + FIELD field_2705 description Ljava/util/List; + FIELD field_2706 parent Lnet/minecraft/class_456; FIELD field_2707 children Ljava/util/List; FIELD field_2709 WIDGETS_TEX Lnet/minecraft/class_2960; FIELD field_2710 yPos I FIELD field_2711 xPos I FIELD field_2712 display Lnet/minecraft/class_185; + FIELD field_2713 title Ljava/lang/String; + FIELD field_2714 progress Lnet/minecraft/class_167; + FIELD field_2715 width I METHOD (Lnet/minecraft/class_454;Lnet/minecraft/class_310;Lnet/minecraft/class_161;Lnet/minecraft/class_185;)V - ARG 1 tree + ARG 1 tab ARG 2 client ARG 3 advancement - METHOD method_2328 getRootWidget (Lnet/minecraft/class_161;)Lnet/minecraft/class_456; + ARG 4 display + METHOD method_2322 addChild (Lnet/minecraft/class_456;)V + ARG 1 widget + METHOD method_2323 renderLines (IIZ)V + ARG 1 x + ARG 2 y + ARG 3 firstPass + METHOD method_2325 renderWidgets (II)V + ARG 1 x + ARG 2 y + METHOD method_2326 getY ()I + METHOD method_2327 getX ()I + METHOD method_2328 getParent (Lnet/minecraft/class_161;)Lnet/minecraft/class_456; + ARG 1 advancement + METHOD method_2330 wrapDescription (Ljava/lang/String;I)Ljava/util/List; + ARG 1 description + ARG 2 width + METHOD method_2332 addToTree ()V METHOD method_2333 setProgress (Lnet/minecraft/class_167;)V + ARG 1 progress diff --git a/mappings/net/minecraft/client/gui/screen/advancement/AdvancementsScreen.mapping b/mappings/net/minecraft/client/gui/screen/advancement/AdvancementsScreen.mapping index fc22e6ab4b..a24d510a86 100644 --- a/mappings/net/minecraft/client/gui/screen/advancement/AdvancementsScreen.mapping +++ b/mappings/net/minecraft/client/gui/screen/advancement/AdvancementsScreen.mapping @@ -1,8 +1,8 @@ CLASS net/minecraft/class_457 net/minecraft/client/gui/screen/advancement/AdvancementsScreen FIELD field_2716 TABS_TEXTURE Lnet/minecraft/class_2960; FIELD field_2717 WINDOW_TEXTURE Lnet/minecraft/class_2960; - FIELD field_2719 widgetMap Ljava/util/Map; - FIELD field_2720 selectedWidget Lnet/minecraft/class_454; + FIELD field_2719 tabs Ljava/util/Map; + FIELD field_2720 selectedTab Lnet/minecraft/class_454; FIELD field_2721 advancementHandler Lnet/minecraft/class_632; METHOD keyPressed (III)Z ARG 1 keyCode @@ -12,7 +12,8 @@ CLASS net/minecraft/class_457 net/minecraft/client/gui/screen/advancement/Advanc ARG 1 x METHOD method_2335 getAdvancementWidget (Lnet/minecraft/class_161;)Lnet/minecraft/class_456; ARG 1 advancement - METHOD method_2336 getAdvancementTreeWidget (Lnet/minecraft/class_161;)Lnet/minecraft/class_454; + METHOD method_2336 getTab (Lnet/minecraft/class_161;)Lnet/minecraft/class_454; + ARG 1 advancement METHOD method_2337 drawAdvancementTree (IIII)V ARG 1 mouseX ARG 2 mouseY @@ -21,6 +22,7 @@ CLASS net/minecraft/class_457 net/minecraft/client/gui/screen/advancement/Advanc ARG 1 mouseX ARG 2 mouseY ARG 3 x + ARG 4 y METHOD mouseClicked (DDI)Z ARG 1 mouseX ARG 3 mouseY diff --git a/mappings/net/minecraft/client/gui/screen/multiplayer/MultiplayerScreen.mapping b/mappings/net/minecraft/client/gui/screen/multiplayer/MultiplayerScreen.mapping index e5ddcc764c..df7c6c79a4 100644 --- a/mappings/net/minecraft/client/gui/screen/multiplayer/MultiplayerScreen.mapping +++ b/mappings/net/minecraft/client/gui/screen/multiplayer/MultiplayerScreen.mapping @@ -29,8 +29,8 @@ CLASS net/minecraft/class_500 net/minecraft/client/gui/screen/multiplayer/Multip METHOD method_2528 setTooltip (Ljava/lang/String;)V ARG 1 text METHOD method_2529 getServerList ()Lnet/minecraft/class_641; - METHOD method_2531 selectEntry (Lnet/minecraft/class_4267$class_504;)V - ARG 1 arg1 + METHOD method_2531 select (Lnet/minecraft/class_4267$class_504;)V + ARG 1 entry METHOD method_2534 refresh ()V METHOD method_2536 connect ()V METHOD method_2548 connect (Lnet/minecraft/class_642;)V diff --git a/mappings/net/minecraft/client/gui/screen/multiplayer/MultiplayerServerListWidget.mapping b/mappings/net/minecraft/client/gui/screen/multiplayer/MultiplayerServerListWidget.mapping index 84f73ae82a..1875683eea 100644 --- a/mappings/net/minecraft/client/gui/screen/multiplayer/MultiplayerServerListWidget.mapping +++ b/mappings/net/minecraft/client/gui/screen/multiplayer/MultiplayerServerListWidget.mapping @@ -2,7 +2,7 @@ CLASS net/minecraft/class_4267 net/minecraft/client/gui/screen/multiplayer/Multi CLASS class_504 Entry CLASS class_4268 ScanningEntry FIELD field_19112 client Lnet/minecraft/class_310; - CLASS class_4269 LanServerListEntry + CLASS class_4269 LanServerEntry FIELD field_19113 client Lnet/minecraft/class_310; FIELD field_19114 server Lnet/minecraft/class_1131; FIELD field_19115 screen Lnet/minecraft/class_500; @@ -15,26 +15,41 @@ CLASS net/minecraft/class_4267 net/minecraft/client/gui/screen/multiplayer/Multi ARG 1 mouseX ARG 3 mouseY ARG 5 button - CLASS class_4270 ServerItem + CLASS class_4270 ServerEntry FIELD field_19118 screen Lnet/minecraft/class_500; FIELD field_19119 client Lnet/minecraft/class_310; FIELD field_19120 server Lnet/minecraft/class_642; - FIELD field_19121 iconLocation Lnet/minecraft/class_2960; - FIELD field_19123 iconTexture Lnet/minecraft/class_1043; + FIELD field_19121 iconTextureId Lnet/minecraft/class_2960; + FIELD field_19122 iconUri Ljava/lang/String; + FIELD field_19123 icon Lnet/minecraft/class_1043; FIELD field_19124 time J METHOD (Lnet/minecraft/class_4267;Lnet/minecraft/class_500;Lnet/minecraft/class_642;)V ARG 2 screen ARG 3 server + METHOD (Lnet/minecraft/class_500;Lnet/minecraft/class_642;)V + ARG 1 screen + ARG 2 server METHOD method_20133 getServer ()Lnet/minecraft/class_642; + METHOD method_20134 draw (IILnet/minecraft/class_2960;)V + ARG 1 x + ARG 2 y + ARG 3 textureId + METHOD method_20137 updateIcon ()V + METHOD method_22110 swapEntries (II)V + ARG 1 i + ARG 2 j METHOD mouseClicked (DDI)Z ARG 1 mouseX ARG 3 mouseY ARG 5 button FIELD field_19104 LOGGER Lorg/apache/logging/log4j/Logger; + FIELD field_19105 SERVER_PINGER_THREAD_POOL Ljava/util/concurrent/ThreadPoolExecutor; + FIELD field_19106 UNKNOWN_SERVER_TEXTURE Lnet/minecraft/class_2960; + FIELD field_19107 SERVER_SELECTION_TEXTURE Lnet/minecraft/class_2960; FIELD field_19108 screen Lnet/minecraft/class_500; - FIELD field_19109 serverItems Ljava/util/List; + FIELD field_19109 servers Ljava/util/List; FIELD field_19110 scanningEntry Lnet/minecraft/class_4267$class_504; - FIELD field_19111 serverEntries Ljava/util/List; + FIELD field_19111 lanServers Ljava/util/List; METHOD (Lnet/minecraft/class_500;Lnet/minecraft/class_310;IIIII)V ARG 1 screen ARG 2 client @@ -43,3 +58,8 @@ CLASS net/minecraft/class_4267 net/minecraft/client/gui/screen/multiplayer/Multi ARG 5 top ARG 6 bottom ARG 7 entryHeight + METHOD method_20125 setServers (Lnet/minecraft/class_641;)V + ARG 1 servers + METHOD method_20126 setLanServers (Ljava/util/List;)V + ARG 1 lanServers + METHOD method_20131 updateEntries ()V diff --git a/mappings/net/minecraft/client/gui/screen/recipebook/AnimatedResultButton.mapping b/mappings/net/minecraft/client/gui/screen/recipebook/AnimatedResultButton.mapping index aa4a78250f..2fc68f8175 100644 --- a/mappings/net/minecraft/client/gui/screen/recipebook/AnimatedResultButton.mapping +++ b/mappings/net/minecraft/client/gui/screen/recipebook/AnimatedResultButton.mapping @@ -13,6 +13,8 @@ CLASS net/minecraft/class_514 net/minecraft/client/gui/screen/recipebook/Animate ARG 2 y METHOD method_2642 hasResults ()Z METHOD method_2643 currentRecipe ()Lnet/minecraft/class_1860; + METHOD method_2644 getTooltip (Lnet/minecraft/class_437;)Ljava/util/List; + ARG 1 screen METHOD method_2645 getResultCollection ()Lnet/minecraft/class_516; METHOD renderButton (IIF)V ARG 1 mouseX diff --git a/mappings/net/minecraft/client/gui/screen/recipebook/RecipeAlternatesWidget.mapping b/mappings/net/minecraft/client/gui/screen/recipebook/RecipeAlternatesWidget.mapping index b7e89bcfb1..8bdeae4252 100644 --- a/mappings/net/minecraft/client/gui/screen/recipebook/RecipeAlternatesWidget.mapping +++ b/mappings/net/minecraft/client/gui/screen/recipebook/RecipeAlternatesWidget.mapping @@ -43,6 +43,13 @@ CLASS net/minecraft/class_508 net/minecraft/client/gui/screen/recipebook/RecipeA ARG 5 areaCenterX ARG 6 areaCenterY ARG 7 delta + METHOD method_2618 renderGrid (IIIIII)V + ARG 1 columns + ARG 2 rows + ARG 3 squareSize + ARG 4 borderSize + ARG 5 u + ARG 6 v METHOD mouseClicked (DDI)Z ARG 1 mouseX ARG 3 mouseY diff --git a/mappings/net/minecraft/client/gui/screen/recipebook/RecipeGroupButtonWidget.mapping b/mappings/net/minecraft/client/gui/screen/recipebook/RecipeGroupButtonWidget.mapping index 03e73906f7..efc03e0f9e 100644 --- a/mappings/net/minecraft/client/gui/screen/recipebook/RecipeGroupButtonWidget.mapping +++ b/mappings/net/minecraft/client/gui/screen/recipebook/RecipeGroupButtonWidget.mapping @@ -1,6 +1,8 @@ CLASS net/minecraft/class_512 net/minecraft/client/gui/screen/recipebook/RecipeGroupButtonWidget FIELD field_3122 bounce F FIELD field_3123 category Lnet/minecraft/class_314; + METHOD method_2621 renderIcons (Lnet/minecraft/class_918;)V + ARG 1 itemRenderer METHOD method_2622 checkForNewRecipes (Lnet/minecraft/class_310;)V METHOD method_2623 getCategory ()Lnet/minecraft/class_314; METHOD method_2624 hasKnownRecipes (Lnet/minecraft/class_299;)Z diff --git a/mappings/net/minecraft/client/gui/screen/recipebook/RecipeResultCollection.mapping b/mappings/net/minecraft/client/gui/screen/recipebook/RecipeResultCollection.mapping index 551d74e32a..63443f0b0b 100644 --- a/mappings/net/minecraft/client/gui/screen/recipebook/RecipeResultCollection.mapping +++ b/mappings/net/minecraft/client/gui/screen/recipebook/RecipeResultCollection.mapping @@ -1,12 +1,13 @@ CLASS net/minecraft/class_516 net/minecraft/client/gui/screen/recipebook/RecipeResultCollection - FIELD field_3144 allRecipes Ljava/util/List; - FIELD field_3145 fittableResults Ljava/util/Set; - FIELD field_3146 craftableResults Ljava/util/Set; - FIELD field_3147 allResults Ljava/util/Set; + FIELD field_3144 recipes Ljava/util/List; + FIELD field_3145 fittingRecipes Ljava/util/Set; + FIELD field_3146 craftableRecipes Ljava/util/Set; + FIELD field_3147 unlockedRecipes Ljava/util/Set; + FIELD field_3148 singleOutput Z METHOD method_2647 initialize (Lnet/minecraft/class_3439;)V ARG 1 recipeBook - METHOD method_2648 getResultsExclusive (Z)Ljava/util/List; - ARG 1 isCraftable + METHOD method_2648 getRecipes (Z)Ljava/util/List; + ARG 1 craftable METHOD method_2649 computeCraftables (Lnet/minecraft/class_1662;IILnet/minecraft/class_3439;)V ARG 1 recipeFinder ARG 2 gridWidth @@ -17,6 +18,9 @@ CLASS net/minecraft/class_516 net/minecraft/client/gui/screen/recipebook/RecipeR ARG 1 craftableOnly METHOD method_2652 isInitialized ()Z METHOD method_2653 isCraftable (Lnet/minecraft/class_1860;)Z + ARG 1 recipe METHOD method_2654 addRecipe (Lnet/minecraft/class_1860;)V - METHOD method_2655 hasCraftableResults ()Z - METHOD method_2657 hasFittableResults ()Z + ARG 1 recipe + METHOD method_2655 hasCraftableRecipes ()Z + METHOD method_2656 hasSingleOutput ()Z + METHOD method_2657 hasFittingRecipes ()Z diff --git a/mappings/net/minecraft/client/gui/screen/resourcepack/ResourcePackListWidget.mapping b/mappings/net/minecraft/client/gui/screen/resourcepack/ResourcePackListWidget.mapping index c2b550ef6b..a3db4254fd 100644 --- a/mappings/net/minecraft/client/gui/screen/resourcepack/ResourcePackListWidget.mapping +++ b/mappings/net/minecraft/client/gui/screen/resourcepack/ResourcePackListWidget.mapping @@ -2,19 +2,21 @@ CLASS net/minecraft/class_521 net/minecraft/client/gui/screen/resourcepack/Resou CLASS class_4271 ResourcePackEntry FIELD field_19128 client Lnet/minecraft/class_310; FIELD field_19129 screen Lnet/minecraft/class_519; - FIELD field_19130 widget Lnet/minecraft/class_521; + FIELD field_19130 resourcePackList Lnet/minecraft/class_521; FIELD field_19131 packContainer Lnet/minecraft/class_1075; METHOD (Lnet/minecraft/class_521;Lnet/minecraft/class_519;Lnet/minecraft/class_1075;)V ARG 1 listWidget ARG 2 screen ARG 3 packContainer METHOD method_20144 drawIcon ()V - METHOD method_20145 (Lnet/minecraft/class_523;)V - ARG 1 widget + METHOD method_20145 setList (Lnet/minecraft/class_523;)V + ARG 1 list METHOD method_20147 getCompatibility ()Lnet/minecraft/class_3281; METHOD method_20148 getDescription ()Ljava/lang/String; METHOD method_20149 getDisplayName ()Ljava/lang/String; METHOD method_20150 getPackContainer ()Lnet/minecraft/class_1075; + METHOD method_20152 canSelect ()Z + METHOD method_20153 canRemove ()Z METHOD method_20154 canSortUp ()Z METHOD method_20155 canSortDown ()Z METHOD method_20156 getScreen ()Lnet/minecraft/class_519; diff --git a/mappings/net/minecraft/client/gui/screen/resourcepack/ResourcePackOptionsScreen.mapping b/mappings/net/minecraft/client/gui/screen/resourcepack/ResourcePackOptionsScreen.mapping index 2c92326560..d0cc607ed8 100644 --- a/mappings/net/minecraft/client/gui/screen/resourcepack/ResourcePackOptionsScreen.mapping +++ b/mappings/net/minecraft/client/gui/screen/resourcepack/ResourcePackOptionsScreen.mapping @@ -1,13 +1,17 @@ CLASS net/minecraft/class_519 net/minecraft/client/gui/screen/resourcepack/ResourcePackOptionsScreen - FIELD field_3154 selectedList Lnet/minecraft/class_523; + FIELD field_3154 selectedPacks Lnet/minecraft/class_523; FIELD field_3155 edited Z FIELD field_3156 parent Lnet/minecraft/class_437; - FIELD field_3157 availableList Lnet/minecraft/class_522; + FIELD field_3157 availablePacks Lnet/minecraft/class_522; METHOD (Lnet/minecraft/class_437;)V ARG 1 parent METHOD method_2660 setEdited ()V METHOD method_2663 remove (Lnet/minecraft/class_521$class_4271;)V + ARG 1 resourcePack + METHOD method_2669 isSelected (Lnet/minecraft/class_521$class_4271;)Z + ARG 1 resourcePack METHOD method_2674 select (Lnet/minecraft/class_521$class_4271;)V + ARG 1 resourcePack METHOD render (IIF)V ARG 1 mouseX ARG 2 mouseY diff --git a/mappings/net/minecraft/client/gui/screen/world/CreateWorldScreen.mapping b/mappings/net/minecraft/client/gui/screen/world/CreateWorldScreen.mapping index 0560acac34..6c09c6f3c2 100644 --- a/mappings/net/minecraft/client/gui/screen/world/CreateWorldScreen.mapping +++ b/mappings/net/minecraft/client/gui/screen/world/CreateWorldScreen.mapping @@ -8,14 +8,17 @@ CLASS net/minecraft/class_525 net/minecraft/client/gui/screen/world/CreateWorldS FIELD field_3187 parent Lnet/minecraft/class_437; FIELD field_3188 textFieldLevelName Lnet/minecraft/class_342; FIELD field_3189 buttonMapTypeSwitch Lnet/minecraft/class_4185; - FIELD field_3190 isCreatingLevel Z + FIELD field_3190 creatingLevel Z FIELD field_3191 enableBonusItems Z FIELD field_3192 commandsAllowed Z FIELD field_3193 buttonMoreOptions Lnet/minecraft/class_4185; + FIELD field_3194 gameModeDescriptionLine1 Ljava/lang/String; FIELD field_3195 levelName Ljava/lang/String; + FIELD field_3196 saveFolderName Ljava/lang/String; FIELD field_3197 buttonGenerateBonusItems Lnet/minecraft/class_4185; FIELD field_3198 buttonCustomizeType Lnet/minecraft/class_4185; - FIELD field_3201 gameMode Lnet/minecraft/class_525$class_4539; + FIELD field_3199 gameModeDescriptionLine2 Ljava/lang/String; + FIELD field_3202 moreOptionsOpen Z FIELD field_3203 buttonGenerateStructures Lnet/minecraft/class_4185; FIELD field_3204 generatorType I FIELD field_3205 buttonCreateLevel Lnet/minecraft/class_4185; @@ -25,6 +28,12 @@ CLASS net/minecraft/class_525 net/minecraft/client/gui/screen/world/CreateWorldS ARG 1 keyCode ARG 2 scanCode ARG 3 modifiers + METHOD method_2710 setMoreOptionsOpen (Z)V + ARG 1 moreOptionsOpen + METHOD method_2721 toggleMoreOptions ()V + METHOD method_2722 updateSettingsLabels ()V + METHOD method_2723 isGeneratorTypeValid ()Z + METHOD method_2727 updateSaveFolderName ()V METHOD method_2736 createLevel ()V METHOD method_2737 recreateLevel (Lnet/minecraft/class_31;)V METHOD render (IIF)V diff --git a/mappings/net/minecraft/client/gui/screen/world/WorldListWidget.mapping b/mappings/net/minecraft/client/gui/screen/world/WorldListWidget.mapping index 88e9e4ddcb..c1898a004b 100644 --- a/mappings/net/minecraft/client/gui/screen/world/WorldListWidget.mapping +++ b/mappings/net/minecraft/client/gui/screen/world/WorldListWidget.mapping @@ -1,5 +1,5 @@ CLASS net/minecraft/class_528 net/minecraft/client/gui/screen/world/WorldListWidget - CLASS class_4272 LevelItem + CLASS class_4272 Entry FIELD field_19136 client Lnet/minecraft/class_310; FIELD field_19137 screen Lnet/minecraft/class_526; FIELD field_19138 level Lnet/minecraft/class_34; diff --git a/mappings/net/minecraft/client/gui/widget/AbstractButtonWidget.mapping b/mappings/net/minecraft/client/gui/widget/AbstractButtonWidget.mapping index 6eb6246fad..3c7c24b422 100644 --- a/mappings/net/minecraft/client/gui/widget/AbstractButtonWidget.mapping +++ b/mappings/net/minecraft/client/gui/widget/AbstractButtonWidget.mapping @@ -59,6 +59,8 @@ CLASS net/minecraft/class_339 net/minecraft/client/gui/widget/AbstractButtonWidg ARG 2 mouseY METHOD setAlpha (F)V ARG 1 value + METHOD setFocused (Z)V + ARG 1 focused METHOD setMessage (Ljava/lang/String;)V ARG 1 value METHOD setWidth (I)V diff --git a/mappings/net/minecraft/client/gui/widget/TextFieldWidget.mapping b/mappings/net/minecraft/client/gui/widget/TextFieldWidget.mapping index c049f596db..d14d64256a 100644 --- a/mappings/net/minecraft/client/gui/widget/TextFieldWidget.mapping +++ b/mappings/net/minecraft/client/gui/widget/TextFieldWidget.mapping @@ -1,13 +1,16 @@ CLASS net/minecraft/class_342 net/minecraft/client/gui/widget/TextFieldWidget + FIELD field_17037 selecting Z FIELD field_2088 changedListener Ljava/util/function/Consumer; FIELD field_2092 text Ljava/lang/String; FIELD field_2094 editable Z FIELD field_2095 focused Z + FIELD field_2096 focusUnlocked Z FIELD field_2098 uneditableColor I FIELD field_2099 renderTextProvider Ljava/util/function/BiFunction; FIELD field_2100 editableColor I - FIELD field_2101 cursorMin I - FIELD field_2102 cursorMax I + FIELD field_2101 selectionEnd I + FIELD field_2102 selectionStart I + FIELD field_2103 firstCharacter I FIELD field_2104 textPredicate Ljava/util/function/Predicate; FIELD field_2105 textRenderer Lnet/minecraft/class_327; FIELD field_2106 suggestion Ljava/lang/String; @@ -19,12 +22,15 @@ CLASS net/minecraft/class_342 net/minecraft/client/gui/widget/TextFieldWidget ARG 3 y ARG 4 width ARG 5 height + ARG 6 message METHOD (Lnet/minecraft/class_327;IIIILnet/minecraft/class_342;Ljava/lang/String;)V ARG 1 textRenderer ARG 2 x ARG 3 y ARG 4 width ARG 5 height + ARG 6 copyFrom + ARG 7 message METHOD charTyped (CI)Z ARG 1 chr ARG 2 keyCode @@ -37,42 +43,75 @@ CLASS net/minecraft/class_342 net/minecraft/client/gui/widget/TextFieldWidget ARG 3 modifiers METHOD method_16872 setX (I)V ARG 1 x + METHOD method_16873 erase (I)V + ARG 1 offset METHOD method_1851 hasBorder ()Z METHOD method_1852 setText (Ljava/lang/String;)V ARG 1 text + METHOD method_1853 getWordSkipPosition (I)I + ARG 1 wordOffset METHOD method_1854 setRenderTextProvider (Ljava/util/function/BiFunction;)V ARG 1 renderTextProvider METHOD method_1855 moveCursor (I)V + ARG 1 offset + METHOD method_1856 setFocusUnlocked (Z)V + ARG 1 focusUnlocked METHOD method_1858 setHasBorder (Z)V ARG 1 hasBorder + METHOD method_1859 getInnerWidth ()I METHOD method_1860 setUneditableColor (I)V ARG 1 color METHOD method_1861 getMaxLength ()I METHOD method_1862 setVisible (Z)V ARG 1 visible METHOD method_1863 setChangedListener (Ljava/util/function/Consumer;)V + METHOD method_1864 getWordSkipPosition (IIZ)I + ARG 1 wordOffset + ARG 2 cursorPosition + ARG 3 skipOverSpaces METHOD method_1865 tick ()V METHOD method_1866 getSelectedText ()Ljava/lang/String; - METHOD method_1867 addText (Ljava/lang/String;)V + METHOD method_1867 write (Ljava/lang/String;)V + ARG 1 text METHOD method_1868 setEditableColor (I)V ARG 1 color + METHOD method_1869 getWordSkipPosition (II)I + ARG 1 wordOffset + ARG 2 cursorPosition + METHOD method_1870 setCursorToStart ()V + METHOD method_1872 setCursorToEnd ()V METHOD method_1874 onChanged (Ljava/lang/String;)V ARG 1 newText - METHOD method_1875 setCursor (I)V + METHOD method_1875 setSelectionStart (I)V ARG 1 cursor + METHOD method_1876 setSelected (Z)V + ARG 1 selected + METHOD method_1877 eraseWords (I)V + ARG 1 wordOffset + METHOD method_1878 eraseCharacters (I)V + ARG 1 characterOffset METHOD method_1880 setMaxLength (I)V ARG 1 maximumLength METHOD method_1881 getCursor ()I METHOD method_1882 getText ()Ljava/lang/String; + METHOD method_1883 setCursor (I)V + ARG 1 cursor + METHOD method_1884 setSelectionEnd (I)V METHOD method_1885 isVisible ()Z + METHOD method_1886 drawSelectionHighlight (IIII)V + ARG 1 x1 + ARG 2 y1 + ARG 3 x2 + ARG 4 y2 METHOD method_1887 setSuggestion (Ljava/lang/String;)V ARG 1 suggestion - METHOD method_1888 setIsEditable (Z)V + METHOD method_1888 setEditable (Z)V ARG 1 editable METHOD method_1889 getCharacterX (I)I ARG 1 index METHOD method_1890 setTextPredicate (Ljava/util/function/Predicate;)V ARG 1 textPredicate + METHOD method_20315 isActive ()Z METHOD method_20316 isEditable ()Z METHOD mouseClicked (DDI)Z ARG 1 mouseX diff --git a/mappings/net/minecraft/client/input/Input.mapping b/mappings/net/minecraft/client/input/Input.mapping index bcc745aa8d..5f57225150 100644 --- a/mappings/net/minecraft/client/input/Input.mapping +++ b/mappings/net/minecraft/client/input/Input.mapping @@ -7,5 +7,6 @@ CLASS net/minecraft/class_744 net/minecraft/client/input/Input FIELD field_3908 pressingLeft Z FIELD field_3909 pressingBack Z FIELD field_3910 pressingForward Z + METHOD method_20622 hasForwardMovement ()Z METHOD method_3128 getMovementInput ()Lnet/minecraft/class_241; METHOD method_3129 tick (Z)V diff --git a/mappings/net/minecraft/client/main/Main.mapping b/mappings/net/minecraft/client/main/Main.mapping index db25009cfb..5d36150671 100644 --- a/mappings/net/minecraft/client/main/Main.mapping +++ b/mappings/net/minecraft/client/main/Main.mapping @@ -7,3 +7,5 @@ CLASS net/minecraft/client/main/Main ARG 1 optionSpec METHOD method_11429 isNotNullOrEmpty (Ljava/lang/String;)Z ARG 0 s + METHOD method_21612 toOptional (Ljava/lang/Integer;)Ljava/util/OptionalInt; + ARG 0 i diff --git a/mappings/net/minecraft/client/network/LanServerEntry.mapping b/mappings/net/minecraft/client/network/LanServerInfo.mapping similarity index 97% rename from mappings/net/minecraft/client/network/LanServerEntry.mapping rename to mappings/net/minecraft/client/network/LanServerInfo.mapping index 8d05163981..7cd8f35b6a 100644 --- a/mappings/net/minecraft/client/network/LanServerEntry.mapping +++ b/mappings/net/minecraft/client/network/LanServerInfo.mapping @@ -1,4 +1,4 @@ -CLASS net/minecraft/class_1131 net/minecraft/client/network/LanServerEntry +CLASS net/minecraft/class_1131 net/minecraft/client/network/LanServerInfo FIELD field_5515 motd Ljava/lang/String; FIELD field_5516 lastTimeMillis J FIELD field_5517 addressPort Ljava/lang/String; diff --git a/mappings/net/minecraft/client/options/ServerEntry.mapping b/mappings/net/minecraft/client/network/ServerInfo.mapping similarity index 94% rename from mappings/net/minecraft/client/options/ServerEntry.mapping rename to mappings/net/minecraft/client/network/ServerInfo.mapping index cedad355b4..08f46ccd3e 100644 --- a/mappings/net/minecraft/client/options/ServerEntry.mapping +++ b/mappings/net/minecraft/client/network/ServerInfo.mapping @@ -1,4 +1,4 @@ -CLASS net/minecraft/class_642 net/minecraft/client/options/ServerEntry +CLASS net/minecraft/class_642 net/minecraft/client/network/ServerInfo CLASS class_643 ResourcePackState FIELD field_3765 name Lnet/minecraft/class_2561; METHOD (Ljava/lang/String;ILjava/lang/String;)V diff --git a/mappings/net/minecraft/client/options/DoubleOption.mapping b/mappings/net/minecraft/client/options/DoubleOption.mapping index 31c00f1380..104c6f6014 100644 --- a/mappings/net/minecraft/client/options/DoubleOption.mapping +++ b/mappings/net/minecraft/client/options/DoubleOption.mapping @@ -1,5 +1,5 @@ CLASS net/minecraft/class_4067 net/minecraft/client/options/DoubleOption - FIELD field_18204 interval F + FIELD field_18204 step F FIELD field_18205 min D FIELD field_18206 max D FIELD field_18207 getter Ljava/util/function/Function; @@ -9,10 +9,12 @@ CLASS net/minecraft/class_4067 net/minecraft/client/options/DoubleOption ARG 1 key ARG 2 min ARG 4 max - ARG 6 interval + ARG 6 step ARG 7 getter ARG 8 setter ARG 9 displayStringGetter + METHOD method_18611 getRatio (D)D + ARG 1 value METHOD method_18612 setMax (F)V ARG 1 max METHOD method_18613 get (Lnet/minecraft/class_315;)D @@ -21,6 +23,10 @@ CLASS net/minecraft/class_4067 net/minecraft/client/options/DoubleOption ARG 1 options ARG 2 value METHOD method_18615 getMin ()D + METHOD method_18616 getValue (D)D + ARG 1 ratio METHOD method_18617 getMax ()D + METHOD method_18618 adjust (D)D + ARG 1 value METHOD method_18619 getDisplayString (Lnet/minecraft/class_315;)Ljava/lang/String; ARG 1 options diff --git a/mappings/net/minecraft/client/options/GameOptions.mapping b/mappings/net/minecraft/client/options/GameOptions.mapping index d5988d0f29..06a6a8464e 100644 --- a/mappings/net/minecraft/client/options/GameOptions.mapping +++ b/mappings/net/minecraft/client/options/GameOptions.mapping @@ -100,6 +100,8 @@ CLASS net/minecraft/class_315 net/minecraft/client/options/GameOptions ARG 2 optionsFile METHOD method_1624 setSoundVolume (Lnet/minecraft/class_3419;F)V ARG 1 category + METHOD method_1626 update (Lnet/minecraft/class_2487;)Lnet/minecraft/class_2487; + ARG 1 tag METHOD method_1627 addResourcePackContainersToManager (Lnet/minecraft/class_3283;)V ARG 1 manager METHOD method_1630 getSoundVolume (Lnet/minecraft/class_3419;)F diff --git a/mappings/net/minecraft/client/options/ServerList.mapping b/mappings/net/minecraft/client/options/ServerList.mapping index c3f0218d59..1def57182d 100644 --- a/mappings/net/minecraft/client/options/ServerList.mapping +++ b/mappings/net/minecraft/client/options/ServerList.mapping @@ -1,5 +1,5 @@ CLASS net/minecraft/class_641 net/minecraft/client/options/ServerList - FIELD field_3749 serverEntries Ljava/util/List; + FIELD field_3749 servers Ljava/util/List; FIELD field_3750 client Lnet/minecraft/class_310; FIELD field_3751 LOGGER Lorg/apache/logging/log4j/Logger; METHOD (Lnet/minecraft/class_310;)V diff --git a/mappings/net/minecraft/client/particle/Particle.mapping b/mappings/net/minecraft/client/particle/Particle.mapping index 29f4063242..75bd2465a8 100644 --- a/mappings/net/minecraft/client/particle/Particle.mapping +++ b/mappings/net/minecraft/client/particle/Particle.mapping @@ -77,3 +77,5 @@ CLASS net/minecraft/class_703 net/minecraft/client/particle/Particle ARG 3 blue METHOD method_3085 markDead ()V METHOD method_3086 isAlive ()Z + METHOD method_3087 scale (F)Lnet/minecraft/class_703; + ARG 1 scale diff --git a/mappings/net/minecraft/client/particle/ParticleManager.mapping b/mappings/net/minecraft/client/particle/ParticleManager.mapping index a98c5ad74e..5c64f07579 100644 --- a/mappings/net/minecraft/client/particle/ParticleManager.mapping +++ b/mappings/net/minecraft/client/particle/ParticleManager.mapping @@ -17,6 +17,10 @@ CLASS net/minecraft/class_702 net/minecraft/client/particle/ParticleManager ARG 2 textureManager METHOD method_18829 clearAtlas ()V METHOD method_18834 registerFactory (Lnet/minecraft/class_2396;Lnet/minecraft/class_702$class_4091;)V + METHOD method_18836 loadTextureList (Lnet/minecraft/class_3300;Lnet/minecraft/class_2960;Ljava/util/Map;)V + ARG 1 resourceManager + ARG 2 id + ARG 3 result METHOD method_3043 registerFactory (Lnet/minecraft/class_2396;Lnet/minecraft/class_707;)V ARG 1 type ARG 2 factory diff --git a/mappings/net/minecraft/client/resource/ClientResourcePackCreator.mapping b/mappings/net/minecraft/client/resource/ClientResourcePackCreator.mapping index 2eac7b440b..1c6afea404 100644 --- a/mappings/net/minecraft/client/resource/ClientResourcePackCreator.mapping +++ b/mappings/net/minecraft/client/resource/ClientResourcePackCreator.mapping @@ -10,6 +10,8 @@ CLASS net/minecraft/class_1066 net/minecraft/client/resource/ClientResourcePackC METHOD (Ljava/io/File;Lnet/minecraft/class_1064;)V ARG 1 serverPacksRoot ARG 2 index + METHOD method_19437 delete (Ljava/io/File;)V + ARG 0 file METHOD method_4633 getPack ()Lnet/minecraft/class_3268; METHOD method_4636 getDownloadHeaders ()Ljava/util/Map; METHOD method_4638 loadServerPack (Ljava/io/File;)Ljava/util/concurrent/CompletableFuture; diff --git a/mappings/net/minecraft/client/search/SuffixArray.mapping b/mappings/net/minecraft/client/search/SuffixArray.mapping index 493f988a93..55e1521d49 100644 --- a/mappings/net/minecraft/client/search/SuffixArray.mapping +++ b/mappings/net/minecraft/client/search/SuffixArray.mapping @@ -1,13 +1,22 @@ CLASS net/minecraft/class_1128 net/minecraft/client/search/SuffixArray FIELD field_5502 maxTextLength I FIELD field_5503 objects Ljava/util/List; + FIELD field_5504 suffixIndexToObjectIndex Lit/unimi/dsi/fastutil/ints/IntList; + FIELD field_5505 characters Lit/unimi/dsi/fastutil/ints/IntList; + FIELD field_5506 suffixSplits Lit/unimi/dsi/fastutil/ints/IntList; FIELD field_5507 PRINT_ARRAY Z FIELD field_5508 PRINT_COMPARISONS Z + FIELD field_5509 suffixStarts Lit/unimi/dsi/fastutil/ints/IntList; FIELD field_5510 LOGGER Lorg/apache/logging/log4j/Logger; METHOD method_4804 findAll (Ljava/lang/String;)Ljava/util/List; ARG 1 text + METHOD method_4805 compare (Ljava/lang/String;I)I + ARG 1 string + ARG 2 suffixIndex METHOD method_4806 add (Ljava/lang/Object;Ljava/lang/String;)V ARG 1 object ARG 2 text - METHOD method_4807 reload ()V - METHOD method_4809 debugPrintArray ()V + METHOD method_4807 sort ()V + METHOD method_4808 getDebugString (I)Ljava/lang/String; + ARG 1 suffixIndex + METHOD method_4809 printArray ()V diff --git a/mappings/net/minecraft/client/sound/AbstractBeeSoundInstance.mapping b/mappings/net/minecraft/client/sound/AbstractBeeSoundInstance.mapping index 5c302f29f6..d85777babd 100644 --- a/mappings/net/minecraft/client/sound/AbstractBeeSoundInstance.mapping +++ b/mappings/net/minecraft/client/sound/AbstractBeeSoundInstance.mapping @@ -1,2 +1,7 @@ CLASS net/minecraft/class_4510 net/minecraft/client/sound/AbstractBeeSoundInstance FIELD field_20530 bee Lnet/minecraft/class_4466; + FIELD field_20531 replaced Z + METHOD method_22135 getReplacement ()Lnet/minecraft/class_1101; + METHOD method_22136 shouldReplace ()Z + METHOD method_22137 getMinPitch ()F + METHOD method_22138 getMaxPitch ()F diff --git a/mappings/net/minecraft/client/sound/SoundManager.mapping b/mappings/net/minecraft/client/sound/SoundManager.mapping index d5f0f52987..fa66fc785a 100644 --- a/mappings/net/minecraft/client/sound/SoundManager.mapping +++ b/mappings/net/minecraft/client/sound/SoundManager.mapping @@ -14,6 +14,8 @@ CLASS net/minecraft/class_1144 net/minecraft/client/sound/SoundManager FIELD field_5594 GSON Lcom/google/gson/Gson; METHOD method_18670 tick (Z)V METHOD method_20305 getDebugString ()Ljava/lang/String; + METHOD method_22140 playNextTick (Lnet/minecraft/class_1117;)V + ARG 1 sound METHOD method_4864 getKeys ()Ljava/util/Collection; METHOD method_4865 updateSoundVolume (Lnet/minecraft/class_3419;F)V ARG 1 category @@ -27,6 +29,7 @@ CLASS net/minecraft/class_1144 net/minecraft/client/sound/SoundManager ARG 1 sound ARG 2 delay METHOD method_4873 play (Lnet/minecraft/class_1113;)V + ARG 1 sound METHOD method_4875 stopSounds (Lnet/minecraft/class_2960;Lnet/minecraft/class_3419;)V METHOD method_4876 updateListenerPosition (Lnet/minecraft/class_4184;)V METHOD method_4877 isPlaying (Lnet/minecraft/class_1113;)Z diff --git a/mappings/net/minecraft/client/sound/SoundSystem.mapping b/mappings/net/minecraft/client/sound/SoundSystem.mapping index 5243d4d1db..b898bf4064 100644 --- a/mappings/net/minecraft/client/sound/SoundSystem.mapping +++ b/mappings/net/minecraft/client/sound/SoundSystem.mapping @@ -7,6 +7,7 @@ CLASS net/minecraft/class_1140 net/minecraft/client/sound/SoundSystem FIELD field_18950 sources Ljava/util/Map; FIELD field_18951 sounds Lcom/google/common/collect/Multimap; FIELD field_18952 soundEndTicks Ljava/util/Map; + FIELD field_20532 soundsToPlayNextTick Ljava/util/List; FIELD field_5550 ticks I FIELD field_5551 preloadedSounds Ljava/util/List; FIELD field_5552 loader Lnet/minecraft/class_1144; @@ -26,6 +27,8 @@ CLASS net/minecraft/class_1140 net/minecraft/client/sound/SoundSystem METHOD method_19762 resumeAll ()V METHOD method_20185 tick (Z)V METHOD method_20304 getDebugString ()Ljava/lang/String; + METHOD method_22139 playNextTick (Lnet/minecraft/class_1117;)V + ARG 1 sound METHOD method_4835 isPlaying (Lnet/minecraft/class_1113;)Z METHOD method_4837 reloadSounds ()V METHOD method_4838 stopSounds (Lnet/minecraft/class_2960;Lnet/minecraft/class_3419;)V diff --git a/mappings/net/minecraft/client/texture/NativeImage.mapping b/mappings/net/minecraft/client/texture/NativeImage.mapping index ab0ed664af..288cbaa2ad 100644 --- a/mappings/net/minecraft/client/texture/NativeImage.mapping +++ b/mappings/net/minecraft/client/texture/NativeImage.mapping @@ -141,6 +141,7 @@ CLASS net/minecraft/class_1011 net/minecraft/client/texture/NativeImage METHOD method_4317 copyFrom (Lnet/minecraft/class_1011;)V ARG 1 image METHOD method_4318 getFormat ()Lnet/minecraft/class_1011$class_1012; + METHOD method_4319 mirrorVertically ()V METHOD method_4320 checkAllocated ()V METHOD method_4321 upload (IIIIIIIZZZ)V ARG 1 level diff --git a/mappings/net/minecraft/client/texture/SpriteAtlasTexture.mapping b/mappings/net/minecraft/client/texture/SpriteAtlasTexture.mapping index 216a9533ba..478cf24054 100644 --- a/mappings/net/minecraft/client/texture/SpriteAtlasTexture.mapping +++ b/mappings/net/minecraft/client/texture/SpriteAtlasTexture.mapping @@ -24,6 +24,9 @@ CLASS net/minecraft/class_1059 net/minecraft/client/texture/SpriteAtlasTexture METHOD (Ljava/lang/String;)V ARG 1 atlasPath METHOD method_18159 upload (Lnet/minecraft/class_1059$class_4007;)V + METHOD method_18161 loadSprites (Lnet/minecraft/class_3300;Lnet/minecraft/class_1055;)Ljava/util/List; + ARG 1 resourceManager + ARG 2 stitcher METHOD method_18163 stitch (Lnet/minecraft/class_3300;Ljava/lang/Iterable;Lnet/minecraft/class_3695;)Lnet/minecraft/class_1059$class_4007; METHOD method_18164 loadSprites (Lnet/minecraft/class_3300;Ljava/util/Set;)Ljava/util/Collection; METHOD method_4601 clear ()V diff --git a/mappings/net/minecraft/client/texture/TextureStitcher.mapping b/mappings/net/minecraft/client/texture/TextureStitcher.mapping index 7a10aa2338..78b2c7d49b 100644 --- a/mappings/net/minecraft/client/texture/TextureStitcher.mapping +++ b/mappings/net/minecraft/client/texture/TextureStitcher.mapping @@ -18,7 +18,7 @@ CLASS net/minecraft/class_1055 net/minecraft/client/texture/TextureStitcher ARG 3 width ARG 4 height METHOD method_4565 getTexture ()Lnet/minecraft/class_1055$class_1056; - METHOD method_4566 tryFit (Lnet/minecraft/class_1055$class_1056;)Z + METHOD method_4566 fit (Lnet/minecraft/class_1055$class_1056;)Z METHOD method_4567 getY ()I METHOD method_4568 addAllFilledSlots (Ljava/util/function/Consumer;)V METHOD method_4569 getX ()I @@ -35,10 +35,11 @@ CLASS net/minecraft/class_1055 net/minecraft/client/texture/TextureStitcher ARG 2 maxHeight ARG 3 mipLevel METHOD method_4549 getStitchedSprites ()Ljava/util/List; - METHOD method_4550 tryFit (Lnet/minecraft/class_1055$class_1056;)Z + METHOD method_4550 fit (Lnet/minecraft/class_1055$class_1056;)Z METHOD method_4551 applyMipLevel (II)I ARG 0 size ARG 1 mipLevel + METHOD method_4552 growAndFit (Lnet/minecraft/class_1055$class_1056;)Z METHOD method_4553 add (Lnet/minecraft/class_1058;)V METHOD method_4554 getWidth ()I METHOD method_4555 getHeight ()I diff --git a/mappings/net/minecraft/client/texture/TextureStitcherCannotFitException.mapping b/mappings/net/minecraft/client/texture/TextureStitcherCannotFitException.mapping index f0c2fd68a6..1778bf8e1e 100644 --- a/mappings/net/minecraft/client/texture/TextureStitcherCannotFitException.mapping +++ b/mappings/net/minecraft/client/texture/TextureStitcherCannotFitException.mapping @@ -1 +1,6 @@ CLASS net/minecraft/class_1054 net/minecraft/client/texture/TextureStitcherCannotFitException + FIELD field_20311 sprites Ljava/util/Collection; + METHOD (Lnet/minecraft/class_1058;Ljava/util/Collection;)V + ARG 1 sprite + ARG 2 sprites + METHOD method_21687 getSprites ()Ljava/util/Collection; diff --git a/mappings/net/minecraft/client/tutorial/FindTreeTutorialStepHandler.mapping b/mappings/net/minecraft/client/tutorial/FindTreeTutorialStepHandler.mapping index dcd7112875..f0e6153397 100644 --- a/mappings/net/minecraft/client/tutorial/FindTreeTutorialStepHandler.mapping +++ b/mappings/net/minecraft/client/tutorial/FindTreeTutorialStepHandler.mapping @@ -1,7 +1,13 @@ CLASS net/minecraft/class_1152 net/minecraft/client/tutorial/FindTreeTutorialStepHandler FIELD field_5628 DESCRIPTION Lnet/minecraft/class_2561; FIELD field_5629 ticks I - FIELD field_5630 manager Lnet/minecraft/class_1156; + FIELD field_5630 tutorialManager Lnet/minecraft/class_1156; FIELD field_5631 TITLE Lnet/minecraft/class_2561; - FIELD field_5632 MATCHING_BLOCKS Ljava/util/Set; + FIELD field_5632 TREE_BLOCKS Ljava/util/Set; FIELD field_5633 toast Lnet/minecraft/class_372; + METHOD (Lnet/minecraft/class_1156;)V + ARG 1 tutorialManager + METHOD method_4896 hasBrokenTreeBlocks (Lnet/minecraft/class_746;)Z + ARG 0 player + METHOD onSlotUpdate (Lnet/minecraft/class_1799;)V + ARG 1 item diff --git a/mappings/net/minecraft/client/tutorial/TutorialManager.mapping b/mappings/net/minecraft/client/tutorial/TutorialManager.mapping index 5cc34c719e..397e95cdfe 100644 --- a/mappings/net/minecraft/client/tutorial/TutorialManager.mapping +++ b/mappings/net/minecraft/client/tutorial/TutorialManager.mapping @@ -4,6 +4,9 @@ CLASS net/minecraft/class_1156 net/minecraft/client/tutorial/TutorialManager METHOD method_4905 getGameMode ()Lnet/minecraft/class_1934; METHOD method_4906 onSlotUpdate (Lnet/minecraft/class_1799;)V METHOD method_4907 onBlockAttacked (Lnet/minecraft/class_638;Lnet/minecraft/class_2338;Lnet/minecraft/class_2680;F)V + ARG 1 world + ARG 2 pos + ARG 3 state METHOD method_4908 onUpdateMouse (DD)V ARG 1 deltaX ARG 3 deltaY diff --git a/mappings/net/minecraft/client/tutorial/TutorialStepHandler.mapping b/mappings/net/minecraft/client/tutorial/TutorialStepHandler.mapping index 62faa17bdb..728fb7c7c5 100644 --- a/mappings/net/minecraft/client/tutorial/TutorialStepHandler.mapping +++ b/mappings/net/minecraft/client/tutorial/TutorialStepHandler.mapping @@ -1,10 +1,14 @@ CLASS net/minecraft/class_1155 net/minecraft/client/tutorial/TutorialStepHandler METHOD method_4897 onSlotUpdate (Lnet/minecraft/class_1799;)V + ARG 1 stack METHOD method_4898 onTarget (Lnet/minecraft/class_638;Lnet/minecraft/class_239;)V ARG 1 world ARG 2 hitResult METHOD method_4899 tick ()V METHOD method_4900 onBlockAttacked (Lnet/minecraft/class_638;Lnet/minecraft/class_2338;Lnet/minecraft/class_2680;F)V + ARG 1 client + ARG 2 pos + ARG 3 state METHOD method_4901 onMouseUpdate (DD)V ARG 1 deltaX ARG 3 deltaY diff --git a/mappings/net/minecraft/client/util/GlfwUtil.mapping b/mappings/net/minecraft/client/util/GlfwUtil.mapping index f55d9b16c2..658ac4dd5b 100644 --- a/mappings/net/minecraft/client/util/GlfwUtil.mapping +++ b/mappings/net/minecraft/client/util/GlfwUtil.mapping @@ -1,2 +1,3 @@ CLASS net/minecraft/class_3673 net/minecraft/client/util/GlfwUtil + METHOD method_15973 makeJvmCrash ()V METHOD method_15974 getTime ()D diff --git a/mappings/net/minecraft/client/util/InputUtil.mapping b/mappings/net/minecraft/client/util/InputUtil.mapping index d7cc734ea5..0600eb86dd 100644 --- a/mappings/net/minecraft/client/util/InputUtil.mapping +++ b/mappings/net/minecraft/client/util/InputUtil.mapping @@ -25,6 +25,8 @@ CLASS net/minecraft/class_3675 net/minecraft/client/util/InputUtil METHOD method_1447 createFromCode (I)Lnet/minecraft/class_3675$class_306; METHOD method_15989 getName ()Ljava/lang/String; FIELD field_16237 UNKNOWN_KEYCODE Lnet/minecraft/class_3675$class_306; + FIELD field_20333 GLFW_RAW_MOUSE_MOTION_SUPPORTED_HANDLE Ljava/lang/invoke/MethodHandle; + FIELD field_20334 GLFW_RAW_MOUSE_MOTION I METHOD method_15981 fromName (Ljava/lang/String;)Lnet/minecraft/class_3675$class_306; ARG 0 s METHOD method_15982 getScancodeName (I)Ljava/lang/String; @@ -37,3 +39,7 @@ CLASS net/minecraft/class_3675 net/minecraft/client/util/InputUtil METHOD method_15987 isKeyPressed (JI)Z ARG 0 handle METHOD method_15988 getKeycodeName (I)Ljava/lang/String; + METHOD method_21735 isRawMouseMotionSupported ()Z + METHOD method_21736 setRawMouseMotionMode (JZ)V + ARG 0 window + ARG 2 value diff --git a/mappings/net/minecraft/client/util/NarratorManager.mapping b/mappings/net/minecraft/client/util/NarratorManager.mapping index ce695a3207..123c5251ae 100644 --- a/mappings/net/minecraft/client/util/NarratorManager.mapping +++ b/mappings/net/minecraft/client/util/NarratorManager.mapping @@ -13,3 +13,4 @@ CLASS net/minecraft/class_333 net/minecraft/client/util/NarratorManager METHOD method_19788 narrate (Ljava/lang/String;)V ARG 1 text METHOD method_20371 destroy ()V + METHOD method_20602 getNarratorOption ()Lnet/minecraft/class_4065; diff --git a/mappings/net/minecraft/client/util/PngFile.mapping b/mappings/net/minecraft/client/util/PngFile.mapping index 3255942607..259290613e 100644 --- a/mappings/net/minecraft/client/util/PngFile.mapping +++ b/mappings/net/minecraft/client/util/PngFile.mapping @@ -1,3 +1,12 @@ CLASS net/minecraft/class_1050 net/minecraft/client/util/PngFile + CLASS class_1051 Reader + METHOD method_4543 read (JJI)I + METHOD method_4546 eof (J)I + METHOD method_4546 eof (J)I + METHOD method_4547 skip (JI)V + CLASS class_1052 ChannelReader + CLASS class_1053 FileReader FIELD field_5226 height I FIELD field_5227 width I + METHOD method_4542 createReader (Ljava/io/InputStream;)Lnet/minecraft/class_1050$class_1051; + ARG 0 is diff --git a/mappings/net/minecraft/client/util/ScreenshotUtils.mapping b/mappings/net/minecraft/client/util/ScreenshotUtils.mapping index 49835741fa..d728aa47f4 100644 --- a/mappings/net/minecraft/client/util/ScreenshotUtils.mapping +++ b/mappings/net/minecraft/client/util/ScreenshotUtils.mapping @@ -1,5 +1,22 @@ CLASS net/minecraft/class_318 net/minecraft/client/util/ScreenshotUtils FIELD field_1973 DATE_FORMAT Ljava/text/DateFormat; FIELD field_1974 LOGGER Lorg/apache/logging/log4j/Logger; + METHOD method_1659 saveScreenshot (Ljava/io/File;IILnet/minecraft/class_276;Ljava/util/function/Consumer;)V + ARG 0 gameDirectory + ARG 1 framebufferWidth + ARG 2 framebufferHeight + ARG 3 framebuffer + ARG 4 messageReceiver METHOD method_1660 getScreenshotFilename (Ljava/io/File;)Ljava/io/File; ARG 0 directory + METHOD method_1662 saveScreenshot (Ljava/io/File;Ljava/lang/String;IILnet/minecraft/class_276;Ljava/util/function/Consumer;)V + ARG 0 gameDirectory + ARG 1 fileName + ARG 2 framebufferWidth + ARG 3 framebufferHeight + ARG 4 framebuffer + ARG 5 messageReceiver + METHOD method_1663 takeScreenshot (IILnet/minecraft/class_276;)Lnet/minecraft/class_1011; + ARG 0 width + ARG 1 height + ARG 2 framebuffer diff --git a/mappings/net/minecraft/client/util/math/Vector3f.mapping b/mappings/net/minecraft/client/util/math/Vector3f.mapping index 90531dfea6..d9730d164e 100644 --- a/mappings/net/minecraft/client/util/math/Vector3f.mapping +++ b/mappings/net/minecraft/client/util/math/Vector3f.mapping @@ -22,6 +22,7 @@ CLASS net/minecraft/class_1160 net/minecraft/client/util/math/Vector3f METHOD method_4949 set (FFF)V ARG 1 x ARG 2 y + ARG 3 z METHOD method_4950 dot (Lnet/minecraft/class_1160;)F METHOD method_4951 cross (Lnet/minecraft/class_1160;)V METHOD method_4952 reciprocal ()V diff --git a/mappings/net/minecraft/client/world/ClientChunkManager.mapping b/mappings/net/minecraft/client/world/ClientChunkManager.mapping index 3a65f1ab18..e9c8d2f3dc 100644 --- a/mappings/net/minecraft/client/world/ClientChunkManager.mapping +++ b/mappings/net/minecraft/client/world/ClientChunkManager.mapping @@ -1,27 +1,38 @@ CLASS net/minecraft/class_631 net/minecraft/client/world/ClientChunkManager CLASS class_3681 ClientChunkMap FIELD field_16251 chunks Ljava/util/concurrent/atomic/AtomicReferenceArray; - FIELD field_16252 loadDiameter I - FIELD field_16253 loadDistance I + FIELD field_16252 diameter I + FIELD field_16253 radius I + FIELD field_19143 loadedChunkCount I FIELD field_19204 centerChunkX I FIELD field_19205 centerChunkZ I + METHOD (I)V + ARG 1 radius METHOD (Lnet/minecraft/class_631;I)V ARG 2 loadDistance - METHOD method_16027 index (II)I + METHOD method_16027 getIndex (II)I ARG 1 chunkX ARG 2 chunkZ - METHOD method_16031 unload (ILnet/minecraft/class_2818;)V - ARG 1 chunkX + METHOD method_16031 set (ILnet/minecraft/class_2818;)V + ARG 1 index + ARG 2 chunk METHOD method_16033 getChunk (I)Lnet/minecraft/class_2818; - ARG 1 chunkX - METHOD method_16034 hasChunk (II)Z + ARG 1 index + METHOD method_16034 isInRadius (II)Z ARG 1 chunkX ARG 2 chunkZ + METHOD method_20183 compareAndSet (ILnet/minecraft/class_2818;Lnet/minecraft/class_2818;)Lnet/minecraft/class_2818; + ARG 1 index + ARG 2 expect + ARG 3 update FIELD field_16246 chunks Lnet/minecraft/class_631$class_3681; FIELD field_16525 world Lnet/minecraft/class_638; FIELD field_3676 emptyChunk Lnet/minecraft/class_2818; FIELD field_3677 lightingProvider Lnet/minecraft/class_3568; FIELD field_3679 LOGGER Lorg/apache/logging/log4j/Logger; + METHOD (Lnet/minecraft/class_638;I)V + ARG 1 world + ARG 2 loadDistance METHOD method_16020 loadChunkFromPacket (Lnet/minecraft/class_1937;IILnet/minecraft/class_2540;Lnet/minecraft/class_2487;IZ)Lnet/minecraft/class_2818; ARG 1 world ARG 2 chunkX @@ -31,6 +42,14 @@ CLASS net/minecraft/class_631 net/minecraft/client/world/ClientChunkManager ARG 6 updatedSectionsBits ARG 7 clearOld METHOD method_20180 updateLoadDistance (I)V + ARG 1 loadDistance + METHOD method_20181 positionEquals (Lnet/minecraft/class_2818;II)Z + ARG 0 chunk + ARG 1 x + ARG 2 y + METHOD method_20182 getLoadedChunkCount ()I + METHOD method_20230 getChunkMapRadius (I)I + ARG 0 loadDistance METHOD method_20317 setChunkMapCenter (II)V ARG 1 x ARG 2 z diff --git a/mappings/net/minecraft/client/world/ClientWorld.mapping b/mappings/net/minecraft/client/world/ClientWorld.mapping index 99b5a73625..7337b784fd 100644 --- a/mappings/net/minecraft/client/world/ClientWorld.mapping +++ b/mappings/net/minecraft/client/world/ClientWorld.mapping @@ -11,6 +11,7 @@ CLASS net/minecraft/class_638 net/minecraft/client/world/ClientWorld METHOD (Lnet/minecraft/class_634;Lnet/minecraft/class_1940;Lnet/minecraft/class_2874;ILnet/minecraft/class_3695;Lnet/minecraft/class_761;)V ARG 1 netHandler ARG 2 levelInfo + ARG 4 chunkLoadDistance METHOD method_18107 addPlayer (ILnet/minecraft/class_742;)V ARG 1 id ARG 2 player diff --git a/mappings/net/minecraft/world/World.mapping b/mappings/net/minecraft/world/World.mapping index cff97dc281..33deff44b2 100644 --- a/mappings/net/minecraft/world/World.mapping +++ b/mappings/net/minecraft/world/World.mapping @@ -106,7 +106,7 @@ CLASS net/minecraft/class_1937 net/minecraft/world/World METHOD method_8455 updateHorizontalAdjacent (Lnet/minecraft/class_2338;Lnet/minecraft/class_2248;)V ARG 1 pos METHOD method_8456 getEffectiveHeight ()I - METHOD method_8457 getChunkProviderStatus ()Ljava/lang/String; + METHOD method_8457 getDebugString ()Ljava/lang/String; METHOD method_8458 isSavingDisabled ()Z METHOD method_8459 isEmittingRedstonePower (Lnet/minecraft/class_2338;Lnet/minecraft/class_2350;)Z ARG 1 pos diff --git a/mappings/net/minecraft/world/chunk/ChunkManager.mapping b/mappings/net/minecraft/world/chunk/ChunkManager.mapping index 59501d3d9e..1436699116 100644 --- a/mappings/net/minecraft/world/chunk/ChunkManager.mapping +++ b/mappings/net/minecraft/world/chunk/ChunkManager.mapping @@ -4,7 +4,7 @@ CLASS net/minecraft/class_2802 net/minecraft/world/chunk/ChunkManager ARG 2 z ARG 3 leastStatus ARG 4 create - METHOD method_12122 getStatus ()Ljava/lang/String; + METHOD method_12122 getDebugString ()Ljava/lang/String; METHOD method_12123 isChunkLoaded (II)Z ARG 1 x ARG 2 z