From 18cc384c52270cd5f99d374aa2478b1a155903d7 Mon Sep 17 00:00:00 2001 From: Yanis48 Date: Fri, 7 Aug 2020 20:32:22 +0200 Subject: [PATCH] Random client things (#1663) --- mappings/net/minecraft/client/Keyboard.mapping | 8 +++++++- .../minecraft/client/MinecraftClient.mapping | 2 +- mappings/net/minecraft/client/Mouse.mapping | 2 +- .../minecraft/client/font/TextHandler.mapping | 17 ++++++++++++----- .../gui/WorldGenerationProgressTracker.mapping | 2 +- .../minecraft/client/gui/hud/InGameHud.mapping | 2 ++ .../client/gui/screen/PresetsScreen.mapping | 1 + .../minecraft/client/gui/screen/Screen.mapping | 12 +++++++++++- ...actPackScreen.mapping => PackScreen.mapping} | 8 +++++++- .../client/render/WorldRenderer.mapping | 2 +- .../client/world/GeneratorType.mapping | 5 +++++ mappings/net/minecraft/screen/slot/Slot.mapping | 4 ++-- 12 files changed, 51 insertions(+), 14 deletions(-) rename mappings/net/minecraft/client/gui/screen/pack/{AbstractPackScreen.mapping => PackScreen.mapping} (82%) diff --git a/mappings/net/minecraft/client/Keyboard.mapping b/mappings/net/minecraft/client/Keyboard.mapping index 0ed38c9bb5..53ba3b4d1c 100644 --- a/mappings/net/minecraft/client/Keyboard.mapping +++ b/mappings/net/minecraft/client/Keyboard.mapping @@ -14,7 +14,7 @@ CLASS net/minecraft/class_309 net/minecraft/client/Keyboard ARG 1 window METHOD method_1459 debugWarn (Ljava/lang/String;[Ljava/lang/Object;)V METHOD method_1460 getClipboard ()Ljava/lang/String; - METHOD method_1462 enableRepeatEvents (Z)V + METHOD method_1462 setRepeatEvents (Z)V ARG 1 repeatEvents METHOD method_1465 copyLookAt (ZZ)V METHOD method_1466 onKey (JIIII)V @@ -24,6 +24,12 @@ CLASS net/minecraft/class_309 net/minecraft/client/Keyboard METHOD method_1468 processF3 (I)Z ARG 1 key METHOD method_1469 copyEntity (Lnet/minecraft/class_2960;Lnet/minecraft/class_243;Lnet/minecraft/class_2487;)V + ARG 1 id + ARG 2 pos + ARG 3 tag METHOD method_1472 setup (J)V METHOD method_1474 pollDebugCrash ()V METHOD method_1475 copyBlock (Lnet/minecraft/class_2680;Lnet/minecraft/class_2338;Lnet/minecraft/class_2487;)V + ARG 1 state + ARG 2 pos + ARG 3 tag diff --git a/mappings/net/minecraft/client/MinecraftClient.mapping b/mappings/net/minecraft/client/MinecraftClient.mapping index 83559ae011..bdebf3e18f 100644 --- a/mappings/net/minecraft/client/MinecraftClient.mapping +++ b/mappings/net/minecraft/client/MinecraftClient.mapping @@ -68,7 +68,7 @@ CLASS net/minecraft/class_310 net/minecraft/client/MinecraftClient FIELD field_1756 blockRenderManager Lnet/minecraft/class_776; FIELD field_1757 resourcePackDir Ljava/io/File; FIELD field_1758 tutorialManager Lnet/minecraft/class_1156; - FIELD field_1759 isIntegratedServerRunning Z + FIELD field_1759 integratedServerRunning Z FIELD field_1760 itemColors Lnet/minecraft/class_325; FIELD field_1761 interactionManager Lnet/minecraft/class_636; FIELD field_1762 LOGGER Lorg/apache/logging/log4j/Logger; diff --git a/mappings/net/minecraft/client/Mouse.mapping b/mappings/net/minecraft/client/Mouse.mapping index 7f5d17f820..e4da69b396 100644 --- a/mappings/net/minecraft/client/Mouse.mapping +++ b/mappings/net/minecraft/client/Mouse.mapping @@ -3,7 +3,7 @@ CLASS net/minecraft/class_312 net/minecraft/client/Mouse FIELD field_1780 activeButton I FIELD field_1781 controlLeftTicks I FIELD field_1782 cursorYSmoother Lnet/minecraft/class_3540; - FIELD field_1783 isCursorLocked Z + FIELD field_1783 cursorLocked Z FIELD field_1784 hasResolutionChanged Z FIELD field_1785 lastMouseUpdateTime D FIELD field_1786 eventDeltaWheel D diff --git a/mappings/net/minecraft/client/font/TextHandler.mapping b/mappings/net/minecraft/client/font/TextHandler.mapping index 58d6fcdcf5..43a4b61905 100644 --- a/mappings/net/minecraft/client/font/TextHandler.mapping +++ b/mappings/net/minecraft/client/font/TextHandler.mapping @@ -28,13 +28,13 @@ CLASS net/minecraft/class_5225 net/minecraft/client/font/TextHandler METHOD method_27488 getWidth (Lnet/minecraft/class_5348;)F COMMENT Returns the width of a text. ARG 1 text - METHOD method_27489 trimToWidth (Lnet/minecraft/class_5348;I)Lnet/minecraft/class_2583; - COMMENT Trim a text to be at most {@code maxWidth} wide. + METHOD method_27489 getStyleAt (Lnet/minecraft/class_5348;I)Lnet/minecraft/class_2583; + COMMENT Gets the style at the {@code x} position in a text. COMMENT - COMMENT @return the trimmed text + COMMENT @return a style ARG 1 text - ARG 2 maxWidth - COMMENT the max width of the trimmed text + ARG 2 x + COMMENT the position in the text METHOD method_27490 trimToWidth (Lnet/minecraft/class_5348;ILnet/minecraft/class_2583;)Lnet/minecraft/class_5348; ARG 1 text ARG 2 width @@ -78,6 +78,13 @@ CLASS net/minecraft/class_5225 net/minecraft/client/font/TextHandler ARG 3 style METHOD method_30875 getWidth (Lnet/minecraft/class_5481;)F ARG 1 text + METHOD method_30876 getStyleAt (Lnet/minecraft/class_5481;I)Lnet/minecraft/class_2583; + COMMENT Gets the style at the {@code x} position in a text. + COMMENT + COMMENT @return a style + ARG 1 text + ARG 2 x + COMMENT the position in the text CLASS 1 FIELD field_24219 collector Lnet/minecraft/class_5222; CLASS class_5226 LineWrappingCollector diff --git a/mappings/net/minecraft/client/gui/WorldGenerationProgressTracker.mapping b/mappings/net/minecraft/client/gui/WorldGenerationProgressTracker.mapping index f434a7b11c..f0d837b565 100644 --- a/mappings/net/minecraft/client/gui/WorldGenerationProgressTracker.mapping +++ b/mappings/net/minecraft/client/gui/WorldGenerationProgressTracker.mapping @@ -5,7 +5,7 @@ CLASS net/minecraft/class_3953 net/minecraft/client/gui/WorldGenerationProgressT FIELD field_17477 centerSize I FIELD field_17478 radius I FIELD field_17479 size I - FIELD field_17480 isRunning Z + FIELD field_17480 running Z METHOD (I)V ARG 1 radius METHOD method_17675 start ()V diff --git a/mappings/net/minecraft/client/gui/hud/InGameHud.mapping b/mappings/net/minecraft/client/gui/hud/InGameHud.mapping index 068726ef68..b84c7c1bff 100644 --- a/mappings/net/minecraft/client/gui/hud/InGameHud.mapping +++ b/mappings/net/minecraft/client/gui/hud/InGameHud.mapping @@ -64,6 +64,8 @@ CLASS net/minecraft/class_329 net/minecraft/client/gui/hud/InGameHud ARG 1 matrices ARG 2 x METHOD method_1753 render (Lnet/minecraft/class_4587;F)V + ARG 1 matrices + ARG 2 tickDelta METHOD method_17534 shouldRenderSpectatorCrosshair (Lnet/minecraft/class_239;)Z ARG 1 hitResult METHOD method_1754 renderExperienceBar (Lnet/minecraft/class_4587;I)V diff --git a/mappings/net/minecraft/client/gui/screen/PresetsScreen.mapping b/mappings/net/minecraft/client/gui/screen/PresetsScreen.mapping index 9f9194f334..3deb2d2355 100644 --- a/mappings/net/minecraft/client/gui/screen/PresetsScreen.mapping +++ b/mappings/net/minecraft/client/gui/screen/PresetsScreen.mapping @@ -18,6 +18,7 @@ CLASS net/minecraft/class_430 net/minecraft/client/gui/screen/PresetsScreen FIELD field_2528 name Lnet/minecraft/class_2561; METHOD (Lnet/minecraft/class_1792;Lnet/minecraft/class_2561;Ljava/util/function/Function;)V ARG 1 icon + METHOD method_27571 getName ()Lnet/minecraft/class_2561; CLASS class_4196 SuperflatPresetsListWidget CLASS class_432 SuperflatPresetEntry METHOD method_19389 setPreset ()V diff --git a/mappings/net/minecraft/client/gui/screen/Screen.mapping b/mappings/net/minecraft/client/gui/screen/Screen.mapping index a7484c2e40..3febfddc12 100644 --- a/mappings/net/minecraft/client/gui/screen/Screen.mapping +++ b/mappings/net/minecraft/client/gui/screen/Screen.mapping @@ -39,13 +39,16 @@ CLASS net/minecraft/class_437 net/minecraft/client/gui/screen/Screen ARG 2 override METHOD method_25416 openLink (Ljava/net/URI;)V ARG 1 link - METHOD method_25417 renderTooltip (Lnet/minecraft/class_4587;Ljava/util/List;II)V + METHOD method_25417 renderOrderedTooltip (Lnet/minecraft/class_4587;Ljava/util/List;II)V ARG 1 matrices ARG 2 lines ARG 3 x ARG 4 y METHOD method_25418 renderTextHoverEffect (Lnet/minecraft/class_4587;Lnet/minecraft/class_2583;II)V ARG 1 matrices + ARG 2 style + ARG 3 x + ARG 4 y METHOD method_25419 onClose ()V METHOD method_25420 renderBackground (Lnet/minecraft/class_4587;)V COMMENT Renders the background of this screen. @@ -61,6 +64,7 @@ CLASS net/minecraft/class_437 net/minecraft/client/gui/screen/Screen ARG 3 height METHOD method_25424 renderTooltip (Lnet/minecraft/class_4587;Lnet/minecraft/class_2561;II)V ARG 1 matrices + ARG 2 text ARG 3 x ARG 4 y METHOD method_25425 sendMessage (Ljava/lang/String;Z)V @@ -74,6 +78,7 @@ CLASS net/minecraft/class_437 net/minecraft/client/gui/screen/Screen METHOD method_25429 addChild (Lnet/minecraft/class_364;)Lnet/minecraft/class_364; ARG 1 child METHOD method_25430 handleTextClick (Lnet/minecraft/class_2583;)Z + ARG 1 style METHOD method_25432 removed ()V METHOD method_25433 renderBackground (Lnet/minecraft/class_4587;I)V COMMENT Renders the background of this screen. @@ -102,3 +107,8 @@ CLASS net/minecraft/class_437 net/minecraft/client/gui/screen/Screen METHOD method_25443 hasAltDown ()Z METHOD method_29638 filesDragged (Ljava/util/List;)V ARG 1 paths + METHOD method_30901 renderTooltip (Lnet/minecraft/class_4587;Ljava/util/List;II)V + ARG 1 matrices + ARG 2 lines + ARG 3 x + ARG 4 y diff --git a/mappings/net/minecraft/client/gui/screen/pack/AbstractPackScreen.mapping b/mappings/net/minecraft/client/gui/screen/pack/PackScreen.mapping similarity index 82% rename from mappings/net/minecraft/client/gui/screen/pack/AbstractPackScreen.mapping rename to mappings/net/minecraft/client/gui/screen/pack/PackScreen.mapping index 7d4feeab0b..eceecd2a0c 100644 --- a/mappings/net/minecraft/client/gui/screen/pack/AbstractPackScreen.mapping +++ b/mappings/net/minecraft/client/gui/screen/pack/PackScreen.mapping @@ -1,4 +1,4 @@ -CLASS net/minecraft/class_5375 net/minecraft/client/gui/screen/pack/AbstractPackScreen +CLASS net/minecraft/class_5375 net/minecraft/client/gui/screen/pack/PackScreen FIELD field_25464 LOGGER Lorg/apache/logging/log4j/Logger; FIELD field_25465 DROP_INFO Lnet/minecraft/class_2561; FIELD field_25466 FOLDER_INFO Lnet/minecraft/class_2561; @@ -6,9 +6,15 @@ CLASS net/minecraft/class_5375 net/minecraft/client/gui/screen/pack/AbstractPack FIELD field_25469 parent Lnet/minecraft/class_437; FIELD field_25472 availablePackList Lnet/minecraft/class_521; FIELD field_25473 selectedPackList Lnet/minecraft/class_521; + FIELD field_25474 file Ljava/io/File; FIELD field_25475 doneButton Lnet/minecraft/class_4185; FIELD field_25786 UNKNOWN_PACK Lnet/minecraft/class_2960; FIELD field_25787 directoryWatcher Lnet/minecraft/class_5375$class_5426; + METHOD (Lnet/minecraft/class_437;Lnet/minecraft/class_3283;Ljava/util/function/Consumer;Ljava/io/File;Lnet/minecraft/class_2561;)V + ARG 1 parent + ARG 2 packManager + ARG 4 file + ARG 5 title METHOD method_29673 updatePackList (Lnet/minecraft/class_521;Ljava/util/stream/Stream;)V ARG 1 widget ARG 2 packs diff --git a/mappings/net/minecraft/client/render/WorldRenderer.mapping b/mappings/net/minecraft/client/render/WorldRenderer.mapping index 8160c5b21a..5485df68c5 100644 --- a/mappings/net/minecraft/client/render/WorldRenderer.mapping +++ b/mappings/net/minecraft/client/render/WorldRenderer.mapping @@ -294,7 +294,7 @@ CLASS net/minecraft/class_761 net/minecraft/client/render/WorldRenderer METHOD method_8563 addParticle (Lnet/minecraft/class_2394;ZZDDDDDD)V ARG 1 parameters ARG 2 shouldAlwaysSpawn - ARG 3 isImportant + ARG 3 important ARG 4 x ARG 6 y ARG 8 z diff --git a/mappings/net/minecraft/client/world/GeneratorType.mapping b/mappings/net/minecraft/client/world/GeneratorType.mapping index 419a609979..7d043a15e5 100644 --- a/mappings/net/minecraft/client/world/GeneratorType.mapping +++ b/mappings/net/minecraft/client/world/GeneratorType.mapping @@ -13,5 +13,10 @@ CLASS net/minecraft/class_5317 net/minecraft/client/world/GeneratorType ARG 1 translationKey METHOD method_29075 getTranslationKey ()Lnet/minecraft/class_2561; METHOD method_29076 getChunkGenerator (Lnet/minecraft/class_2378;Lnet/minecraft/class_2378;J)Lnet/minecraft/class_2794; + ARG 1 biomeRegistry + ARG 2 chunkGeneratorSettingsRegistry + ARG 3 seed METHOD method_29083 getFirstBiome (Lnet/minecraft/class_5455;Lnet/minecraft/class_5285;)Lnet/minecraft/class_1959; + ARG 0 registryManager + ARG 1 options CLASS class_5293 ScreenProvider diff --git a/mappings/net/minecraft/screen/slot/Slot.mapping b/mappings/net/minecraft/screen/slot/Slot.mapping index d7ff612816..a902736db5 100644 --- a/mappings/net/minecraft/screen/slot/Slot.mapping +++ b/mappings/net/minecraft/screen/slot/Slot.mapping @@ -25,8 +25,8 @@ CLASS net/minecraft/class_1735 net/minecraft/screen/slot/Slot ARG 1 stack METHOD method_7674 canTakeItems (Lnet/minecraft/class_1657;)Z ARG 1 playerEntity - METHOD method_7675 getMaxStackAmount ()I - METHOD method_7676 getMaxStackAmount (Lnet/minecraft/class_1799;)I + METHOD method_7675 getMaxItemCount ()I + METHOD method_7676 getMaxItemCount (Lnet/minecraft/class_1799;)I ARG 1 stack METHOD method_7677 getStack ()Lnet/minecraft/class_1799; METHOD method_7678 onCrafted (Lnet/minecraft/class_1799;I)V