From e16794a8211d6be8c05652cc15d5a4f1b3c28166 Mon Sep 17 00:00:00 2001 From: Ennui Langeweile <85590273+EnnuiL@users.noreply.github.com> Date: Sat, 17 Jun 2023 16:38:56 -0300 Subject: [PATCH] Randomly map stuff again! (Refactor Edition) (#445) * a * Nab mappings from previous attempt * Map a bit more * Map more and more * requiredBlock -> requiredGroundBlock --------- Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> --- .../com/mojang/blaze3d/glfw/Window.mapping | 2 ++ .../net/minecraft/block/CropBlock.mapping | 2 +- .../net/minecraft/block/Fertilizable.mapping | 5 ++-- .../net/minecraft/block/FungusBlock.mapping | 4 +++ .../minecraft/block/PitcherCropBlock.mapping | 26 +++++++++++++++++++ .../minecraft/client/MinecraftClient.mapping | 2 +- .../client/network/ClientPlayerEntity.mapping | 4 ++- .../client/option/GameOptions.mapping | 20 +++++++++++++- .../minecraft/client/option/KeyBind.mapping | 3 ++- .../minecraft/client/option/Option.mapping | 25 ++++++++++++++++-- .../client/option/StickyKeyBind.mapping | 1 + .../animation/AnimationKeyframe.mapping | 4 +-- .../render/animation/PartAnimation.mapping | 4 +-- .../entity/model/ModelWithWaterPatch.mapping | 2 ++ .../net/minecraft/datafixer/Schemas.mapping | 2 ++ .../datafixer/fix/StatsCounterFix.mapping | 5 ++++ .../sound/BiomeAdditionsSound.mapping | 7 +++++ .../minecraft/sound/BiomeMoodSound.mapping | 13 ++++++++++ mappings/net/minecraft/stat/Stat.mapping | 1 + .../net/minecraft/stat/StatFormatter.mapping | 10 +++++++ .../net/minecraft/util/CommonColors.mapping | 2 ++ .../net/minecraft/util/JsonHelper.mapping | 3 +++ .../minecraft/util/SimpleBitStorage.mapping | 3 +++ mappings/net/minecraft/util/Util.mapping | 2 ++ .../net/minecraft/util/ZipCompressor.mapping | 1 + .../net/minecraft/util/dynamic/Codecs.mapping | 2 ++ .../minecraft/world/MobSpawnerEntry.mapping | 4 +++ 27 files changed, 146 insertions(+), 13 deletions(-) create mode 100644 mappings/net/minecraft/client/render/entity/model/ModelWithWaterPatch.mapping diff --git a/mappings/com/mojang/blaze3d/glfw/Window.mapping b/mappings/com/mojang/blaze3d/glfw/Window.mapping index 3598b1957e..d48ce97a9e 100644 --- a/mappings/com/mojang/blaze3d/glfw/Window.mapping +++ b/mappings/com/mojang/blaze3d/glfw/Window.mapping @@ -30,6 +30,7 @@ CLASS net/minecraft/unmapped/C_snosbckc com/mojang/blaze3d/glfw/Window ARG 3 settings ARG 4 videoMode ARG 5 title + METHOD close close ()V METHOD m_bvgeocso calculateScaleFactor (IZ)I ARG 1 guiScale ARG 2 forceUnicodeFont @@ -87,6 +88,7 @@ CLASS net/minecraft/unmapped/C_snosbckc com/mojang/blaze3d/glfw/Window METHOD m_swknsuot setRawMouseMotion (Z)V ARG 1 rawMouseMotion METHOD m_tmxadezh setIcon (Lnet/minecraft/unmapped/C_tguinuvn;Lnet/minecraft/unmapped/C_xksdrgbg;)V + ARG 1 pack ARG 2 icon METHOD m_txiqdyhu getWidth ()I METHOD m_tzsavrbr logGlError (IJ)V diff --git a/mappings/net/minecraft/block/CropBlock.mapping b/mappings/net/minecraft/block/CropBlock.mapping index dbec0b8846..e921c56e27 100644 --- a/mappings/net/minecraft/block/CropBlock.mapping +++ b/mappings/net/minecraft/block/CropBlock.mapping @@ -17,7 +17,7 @@ CLASS net/minecraft/unmapped/C_rhzoiqkd net/minecraft/block/CropBlock ARG 2 pos METHOD m_zqwsxueh isMature (Lnet/minecraft/unmapped/C_txtbiemp;)Z ARG 1 state - METHOD m_zueyanzo applyGrowth (Lnet/minecraft/unmapped/C_cdctfzbn;Lnet/minecraft/unmapped/C_hynzadkk;Lnet/minecraft/unmapped/C_txtbiemp;)V + METHOD m_zueyanzo grow (Lnet/minecraft/unmapped/C_cdctfzbn;Lnet/minecraft/unmapped/C_hynzadkk;Lnet/minecraft/unmapped/C_txtbiemp;)V ARG 1 world ARG 2 pos ARG 3 state diff --git a/mappings/net/minecraft/block/Fertilizable.mapping b/mappings/net/minecraft/block/Fertilizable.mapping index e554777935..3311223ee1 100644 --- a/mappings/net/minecraft/block/Fertilizable.mapping +++ b/mappings/net/minecraft/block/Fertilizable.mapping @@ -1,14 +1,15 @@ CLASS net/minecraft/unmapped/C_svvihwsq net/minecraft/block/Fertilizable METHOD m_lqjmmujl isFertilizable (Lnet/minecraft/unmapped/C_eemzphbi;Lnet/minecraft/unmapped/C_hynzadkk;Lnet/minecraft/unmapped/C_txtbiemp;Z)Z + ARG 1 world ARG 2 pos ARG 3 state ARG 4 isClient - METHOD m_mxdrxjjx canGrow (Lnet/minecraft/unmapped/C_cdctfzbn;Lnet/minecraft/unmapped/C_rlomrsco;Lnet/minecraft/unmapped/C_hynzadkk;Lnet/minecraft/unmapped/C_txtbiemp;)Z + METHOD m_mxdrxjjx canFertilize (Lnet/minecraft/unmapped/C_cdctfzbn;Lnet/minecraft/unmapped/C_rlomrsco;Lnet/minecraft/unmapped/C_hynzadkk;Lnet/minecraft/unmapped/C_txtbiemp;)Z ARG 1 world ARG 2 random ARG 3 pos ARG 4 state - METHOD m_tbosypih grow (Lnet/minecraft/unmapped/C_bdwnwhiu;Lnet/minecraft/unmapped/C_rlomrsco;Lnet/minecraft/unmapped/C_hynzadkk;Lnet/minecraft/unmapped/C_txtbiemp;)V + METHOD m_tbosypih fertilize (Lnet/minecraft/unmapped/C_bdwnwhiu;Lnet/minecraft/unmapped/C_rlomrsco;Lnet/minecraft/unmapped/C_hynzadkk;Lnet/minecraft/unmapped/C_txtbiemp;)V ARG 1 world ARG 2 random ARG 3 pos diff --git a/mappings/net/minecraft/block/FungusBlock.mapping b/mappings/net/minecraft/block/FungusBlock.mapping index bcd0ed5d69..274cf06d9c 100644 --- a/mappings/net/minecraft/block/FungusBlock.mapping +++ b/mappings/net/minecraft/block/FungusBlock.mapping @@ -2,8 +2,12 @@ CLASS net/minecraft/unmapped/C_naobsnoy net/minecraft/block/FungusBlock FIELD f_agxfxgwm SHAPE Lnet/minecraft/unmapped/C_zscvhwbd; FIELD f_cyyobiev feature Lnet/minecraft/unmapped/C_xhhleach; FIELD f_ditsybst GROW_CHANCE D + FIELD f_kvrossnb requiredGroundBlock Lnet/minecraft/unmapped/C_mmxmpdoq; METHOD (Lnet/minecraft/unmapped/C_triydqro$C_xnkxsdfy;Lnet/minecraft/unmapped/C_xhhleach;Lnet/minecraft/unmapped/C_mmxmpdoq;)V ARG 1 settings + ARG 2 feature + ARG 3 requiredGroundBlock METHOD m_bbjppoox getFeatureHolder (Lnet/minecraft/unmapped/C_eemzphbi;)Ljava/util/Optional; + ARG 1 world METHOD m_rqynidme (Lnet/minecraft/unmapped/C_bdwnwhiu;Lnet/minecraft/unmapped/C_rlomrsco;Lnet/minecraft/unmapped/C_hynzadkk;Lnet/minecraft/unmapped/C_cjzoxshv;)V ARG 3 featureHolder diff --git a/mappings/net/minecraft/block/PitcherCropBlock.mapping b/mappings/net/minecraft/block/PitcherCropBlock.mapping index 65485e310d..a9058acc5c 100644 --- a/mappings/net/minecraft/block/PitcherCropBlock.mapping +++ b/mappings/net/minecraft/block/PitcherCropBlock.mapping @@ -9,8 +9,34 @@ CLASS net/minecraft/unmapped/C_fntbpikr net/minecraft/block/PitcherCropBlock FIELD f_vspqavca UPPER_OUTLINE_SHAPES [Lnet/minecraft/unmapped/C_zscvhwbd; FIELD f_zixwbbhv AGE Lnet/minecraft/unmapped/C_vltzvhxi; FIELD f_zotorzfo FULLY_GROWN_LOWER_SHAPE Lnet/minecraft/unmapped/C_zscvhwbd; + METHOD m_duxcbgiw isUpperHalf (Lnet/minecraft/unmapped/C_txtbiemp;)Z + ARG 0 state METHOD m_ecjdnzgk isMaxAge (Lnet/minecraft/unmapped/C_txtbiemp;)Z + ARG 1 state METHOD m_itpfzjql grow (Lnet/minecraft/unmapped/C_bdwnwhiu;Lnet/minecraft/unmapped/C_txtbiemp;Lnet/minecraft/unmapped/C_hynzadkk;I)V + ARG 1 world + ARG 2 state + ARG 3 pos ARG 4 amount METHOD m_luiomuxe isLowerHalf (Lnet/minecraft/unmapped/C_txtbiemp;)Z + ARG 0 state + METHOD m_ocvvosbx hasEnoughLight (Lnet/minecraft/unmapped/C_eemzphbi;Lnet/minecraft/unmapped/C_hynzadkk;)Z + ARG 0 world + ARG 1 pos + METHOD m_ojkbyeir canGrow (Lnet/minecraft/unmapped/C_eemzphbi;Lnet/minecraft/unmapped/C_hynzadkk;Lnet/minecraft/unmapped/C_txtbiemp;I)Z + ARG 1 world + ARG 2 pos + ARG 3 state + ARG 4 age METHOD m_sploctuc canGrowInto (Lnet/minecraft/unmapped/C_eemzphbi;Lnet/minecraft/unmapped/C_hynzadkk;)Z + ARG 0 world + ARG 1 pos + METHOD m_vhxaczet getLowerHalf (Lnet/minecraft/unmapped/C_eemzphbi;Lnet/minecraft/unmapped/C_hynzadkk;Lnet/minecraft/unmapped/C_txtbiemp;)Lnet/minecraft/unmapped/C_fntbpikr$C_jrcoboha; + ARG 1 world + ARG 2 pos + ARG 3 state + CLASS C_jrcoboha LowerHalfInfo + FIELD f_bathctbu pos Lnet/minecraft/unmapped/C_hynzadkk; + FIELD f_zoszfvcj state Lnet/minecraft/unmapped/C_txtbiemp; + METHOD m_nejoprki state ()Lnet/minecraft/unmapped/C_txtbiemp; + METHOD m_ybyenxlv pos ()Lnet/minecraft/unmapped/C_hynzadkk; diff --git a/mappings/net/minecraft/client/MinecraftClient.mapping b/mappings/net/minecraft/client/MinecraftClient.mapping index b7f48fd644..a65e12b4fe 100644 --- a/mappings/net/minecraft/client/MinecraftClient.mapping +++ b/mappings/net/minecraft/client/MinecraftClient.mapping @@ -418,7 +418,7 @@ CLASS net/minecraft/unmapped/C_ayfeobid net/minecraft/client/MinecraftClient ARG 5 height METHOD m_qitbpodu (Lnet/minecraft/unmapped/C_rdaqiwdt;)Ljava/lang/String; ARG 0 text - METHOD m_qozcjtsz connectQuickPlay (Lnet/minecraft/unmapped/C_ivysvyzf;Lnet/minecraft/unmapped/C_dzecaeok;Lnet/minecraft/unmapped/C_pdsiuywi$C_ztbvorvu;)V + METHOD m_qozcjtsz setInitialScreen (Lnet/minecraft/unmapped/C_ivysvyzf;Lnet/minecraft/unmapped/C_dzecaeok;Lnet/minecraft/unmapped/C_pdsiuywi$C_ztbvorvu;)V ARG 1 realmsClient ARG 2 resourceReload ARG 3 quickPlay diff --git a/mappings/net/minecraft/client/network/ClientPlayerEntity.mapping b/mappings/net/minecraft/client/network/ClientPlayerEntity.mapping index 22fbd66cda..4c05c22154 100644 --- a/mappings/net/minecraft/client/network/ClientPlayerEntity.mapping +++ b/mappings/net/minecraft/client/network/ClientPlayerEntity.mapping @@ -21,6 +21,7 @@ CLASS net/minecraft/unmapped/C_jlopmfei net/minecraft/client/network/ClientPlaye FIELD f_iqzqxmpg lastSprinting Z FIELD f_irzjhfpc lastRenderPitch F FIELD f_iuztugfq LOGGER Lorg/slf4j/Logger; + FIELD f_jfhotzll screenSwirlIntensity F FIELD f_kkjehvrb ticksLeftToDoubleTapSprint I FIELD f_lnothlou showsDeathScreen Z FIELD f_lonrepuj inSneakingPose Z @@ -41,6 +42,7 @@ CLASS net/minecraft/unmapped/C_jlopmfei net/minecraft/client/network/ClientPlaye FIELD f_weecdoml lastRenderYaw F FIELD f_xryucszr lastZ D FIELD f_zkrtgbyu falling Z + FIELD f_ztnegqze lastScreenSwirlIntensity F FIELD f_zxxybkqq ticksSinceLastPositionPacketSent I METHOD (Lnet/minecraft/unmapped/C_ayfeobid;Lnet/minecraft/unmapped/C_ghdnlrrw;Lnet/minecraft/unmapped/C_nuofrxvi;Lnet/minecraft/unmapped/C_udjcmsxa;Lnet/minecraft/unmapped/C_sjlfgpfd;ZZ)V ARG 1 client @@ -101,7 +103,7 @@ CLASS net/minecraft/unmapped/C_jlopmfei net/minecraft/client/network/ClientPlaye METHOD m_vpbjdgjd isWalking ()Z METHOD m_wizdihxh getServerBrand ()Ljava/lang/String; METHOD m_wnyjanfc isRiding ()Z - METHOD m_xdficjfl updateNausea ()V + METHOD m_xdficjfl updateScreenSwirl ()V METHOD m_xfculten hasMovementInput ()Z COMMENT {@return whether the player has movement input} METHOD m_xzwqqutd showsDeathScreen ()Z diff --git a/mappings/net/minecraft/client/option/GameOptions.mapping b/mappings/net/minecraft/client/option/GameOptions.mapping index 823c1a9346..f004b91242 100644 --- a/mappings/net/minecraft/client/option/GameOptions.mapping +++ b/mappings/net/minecraft/client/option/GameOptions.mapping @@ -138,6 +138,7 @@ CLASS net/minecraft/unmapped/C_lscptbhn net/minecraft/client/option/GameOptions COMMENT Bound to {@linkplain org.lwjgl.glfw.GLFW#GLFW_KEY_W the W key} by default. FIELD f_pgipbphp mainArm Lnet/minecraft/unmapped/C_vbibxkxv; FIELD f_poupdndx monochromeLogo Lnet/minecraft/unmapped/C_vbibxkxv; + FIELD f_pryrouxn AUTO_GUI_SCALE I FIELD f_puhedzsr glintSpeed Lnet/minecraft/unmapped/C_vbibxkxv; FIELD f_pwwkeskp panoramaScrollSpeed Lnet/minecraft/unmapped/C_vbibxkxv; FIELD f_qentjnpp tutorialStep Lnet/minecraft/unmapped/C_goqonutr; @@ -226,6 +227,7 @@ CLASS net/minecraft/unmapped/C_lscptbhn net/minecraft/client/option/GameOptions FIELD f_yyjjazne ONLY_SHOW_SECURE_CHAT_TOOLTIP Lnet/minecraft/unmapped/C_rdaqiwdt; FIELD f_zjliikqj chatOpacity Lnet/minecraft/unmapped/C_vbibxkxv; FIELD f_zmlcorjp particles Lnet/minecraft/unmapped/C_vbibxkxv; + FIELD f_zmnjmtvo MAX_GUI_SCALE I FIELD f_zodqaxzp FOV_EFFECT_SCALE_TOOLTIP Lnet/minecraft/unmapped/C_rdaqiwdt; FIELD f_zznsxrnc soundVolumeLevels Ljava/util/Map; METHOD (Lnet/minecraft/unmapped/C_ayfeobid;Ljava/io/File;)V @@ -236,6 +238,8 @@ CLASS net/minecraft/unmapped/C_lscptbhn net/minecraft/client/option/GameOptions ARG 0 value METHOD m_alcwfqym (Ljava/lang/Double;)V ARG 0 value + METHOD m_alrelyqe (Lnet/minecraft/unmapped/C_pqzizukq;Ljava/lang/Double;)V + ARG 1 value METHOD m_anzbfquj (Ljava/lang/Double;)V ARG 0 value METHOD m_aplmvdrk getGraphicsMode ()Lnet/minecraft/unmapped/C_vbibxkxv; @@ -312,6 +316,7 @@ CLASS net/minecraft/unmapped/C_lscptbhn net/minecraft/client/option/GameOptions METHOD m_hcwbksdl (Ljava/util/EnumMap;)V ARG 1 value METHOD m_heqcqyiz (Lnet/minecraft/unmapped/C_rdaqiwdt;Ljava/lang/Double;)Lnet/minecraft/unmapped/C_rdaqiwdt; + ARG 0 option ARG 1 value METHOD m_hfsamqbt getOperatorItemsTab ()Lnet/minecraft/unmapped/C_vbibxkxv; METHOD m_hkydmiab (Lnet/minecraft/unmapped/C_rdaqiwdt;Ljava/lang/Double;)Lnet/minecraft/unmapped/C_rdaqiwdt; @@ -341,6 +346,8 @@ CLASS net/minecraft/unmapped/C_lscptbhn net/minecraft/client/option/GameOptions METHOD m_ipttjvha (Lnet/minecraft/unmapped/C_rdaqiwdt;Ljava/lang/Boolean;)Lnet/minecraft/unmapped/C_rdaqiwdt; ARG 0 optionText ARG 1 value + METHOD m_iqjavkit (Ljava/lang/Boolean;)V + ARG 0 value METHOD m_ithfgexd setKeyCode (Lnet/minecraft/unmapped/C_sygikzty;Lnet/minecraft/unmapped/C_vdmgqzcl$C_smckmtvp;)V ARG 1 key ARG 2 code @@ -408,6 +415,8 @@ CLASS net/minecraft/unmapped/C_lscptbhn net/minecraft/client/option/GameOptions ARG 1 value METHOD m_mnkxarrw isTrue (Ljava/lang/String;)Z ARG 0 value + METHOD m_molxpuyp (I)Ljava/lang/Double; + ARG 0 i METHOD m_mozmhutf getMonochromeLogo ()Lnet/minecraft/unmapped/C_vbibxkxv; METHOD m_mukwgtgs getToggleableSneak ()Lnet/minecraft/unmapped/C_vbibxkxv; METHOD m_nbbwacqv toMouseWheelSensitivitySliderProgressValue (D)I @@ -428,6 +437,8 @@ CLASS net/minecraft/unmapped/C_lscptbhn net/minecraft/client/option/GameOptions METHOD m_pcyaicvv (Lnet/minecraft/unmapped/C_inrattee;)V ARG 0 value METHOD m_pczumfae getBiomeBlendRadius ()Lnet/minecraft/unmapped/C_vbibxkxv; + METHOD m_phjuspfm (Ljava/lang/Double;)Ljava/lang/Integer; + ARG 0 doubleValue METHOD m_pifwhlkz (Ljava/lang/Boolean;)V ARG 0 value METHOD m_pkbshpzw getPixelValueText (Lnet/minecraft/unmapped/C_rdaqiwdt;I)Lnet/minecraft/unmapped/C_rdaqiwdt; @@ -436,6 +447,8 @@ CLASS net/minecraft/unmapped/C_lscptbhn net/minecraft/client/option/GameOptions METHOD m_plbvmuaz getTextBackgroundOpacity ()Lnet/minecraft/unmapped/C_vbibxkxv; METHOD m_pnnarsvo getTextBackgroundColor (F)I ARG 1 fallbackOpacity + METHOD m_pnstqqgm (Lnet/minecraft/unmapped/C_hhlwcnih;Ljava/lang/String;)V + ARG 1 line METHOD m_pokgrxum getMouseWheelSensitivity ()Lnet/minecraft/unmapped/C_vbibxkxv; METHOD m_qbojyjaj (Lnet/minecraft/unmapped/C_ekczyczh;)V ARG 1 value @@ -481,10 +494,15 @@ CLASS net/minecraft/unmapped/C_lscptbhn net/minecraft/client/option/GameOptions METHOD m_srrrasod (Lnet/minecraft/unmapped/C_rdaqiwdt;Ljava/lang/Integer;)Lnet/minecraft/unmapped/C_rdaqiwdt; ARG 0 optionText ARG 1 value + METHOD m_sssgufqv (Ljava/lang/String;)Lnet/minecraft/unmapped/C_njjnizsa; + ARG 0 string METHOD m_syohccsr getShowSubtitles ()Lnet/minecraft/unmapped/C_vbibxkxv; METHOD m_szrsdlej getReducedDebugInfo ()Lnet/minecraft/unmapped/C_vbibxkxv; METHOD m_tcgvhmva (Lnet/minecraft/unmapped/C_njjnizsa;)Ljava/lang/String; + ARG 0 value ARG 1 value + METHOD m_tdzvvvia (I)Ljava/lang/Double; + ARG 0 i METHOD m_tkjpmwcm (Lnet/minecraft/unmapped/C_rdaqiwdt;Ljava/lang/Double;)Lnet/minecraft/unmapped/C_rdaqiwdt; ARG 0 optionText ARG 1 value @@ -525,7 +543,7 @@ CLASS net/minecraft/unmapped/C_lscptbhn net/minecraft/client/option/GameOptions ARG 1 value METHOD m_wbqggaub (Ljava/lang/Double;)V ARG 0 value - METHOD m_wennyfeo createSoundVolumeIOption (Ljava/lang/String;Lnet/minecraft/unmapped/C_pqzizukq;)Lnet/minecraft/unmapped/C_vbibxkxv; + METHOD m_wennyfeo createSoundVolumeOption (Ljava/lang/String;Lnet/minecraft/unmapped/C_pqzizukq;)Lnet/minecraft/unmapped/C_vbibxkxv; ARG 1 key ARG 2 category METHOD m_whpmwwai (Lnet/minecraft/unmapped/C_rdaqiwdt;Ljava/lang/Double;)Lnet/minecraft/unmapped/C_rdaqiwdt; diff --git a/mappings/net/minecraft/client/option/KeyBind.mapping b/mappings/net/minecraft/client/option/KeyBind.mapping index 91eaf69890..f37b4f4d20 100644 --- a/mappings/net/minecraft/client/option/KeyBind.mapping +++ b/mappings/net/minecraft/client/option/KeyBind.mapping @@ -41,7 +41,7 @@ CLASS net/minecraft/unmapped/C_sygikzty net/minecraft/client/option/KeyBind COMMENT can be pressed and released before the next check. COMMENT COMMENT @see #wasPressed() - METHOD m_godmkzch unpressAll ()V + METHOD m_godmkzch resetAll ()V METHOD m_gvwjhavd onKeyPressed (Lnet/minecraft/unmapped/C_vdmgqzcl$C_smckmtvp;)V ARG 0 key METHOD m_hfuhalee setPressed (Z)V @@ -49,6 +49,7 @@ CLASS net/minecraft/unmapped/C_sygikzty net/minecraft/client/option/KeyBind METHOD m_isuoshsj getDefaultKey ()Lnet/minecraft/unmapped/C_vdmgqzcl$C_smckmtvp; METHOD m_jmbdmqyl updateBoundKeys ()V METHOD m_ktykqjqb getKeyName ()Lnet/minecraft/unmapped/C_rdaqiwdt; + METHOD m_lgozeqdn unpressStickyKeys ()V METHOD m_nbuirqvv updatePressedStates ()V METHOD m_oicaydpw getKeyBindTextSupplier (Ljava/lang/String;)Ljava/util/function/Supplier; ARG 0 id diff --git a/mappings/net/minecraft/client/option/Option.mapping b/mappings/net/minecraft/client/option/Option.mapping index 53f0f116b9..8230420eac 100644 --- a/mappings/net/minecraft/client/option/Option.mapping +++ b/mappings/net/minecraft/client/option/Option.mapping @@ -28,12 +28,23 @@ CLASS net/minecraft/unmapped/C_vbibxkxv net/minecraft/client/option/Option ARG 4 values ARG 5 defaultValue ARG 6 updateCallback - METHOD m_ayuyezwm (Lnet/minecraft/unmapped/C_lscptbhn;IIILjava/util/function/Consumer;)Lnet/minecraft/unmapped/C_kpvuxmkp; + METHOD m_ayuyezwm createButton (Lnet/minecraft/unmapped/C_lscptbhn;IIILjava/util/function/Consumer;)Lnet/minecraft/unmapped/C_kpvuxmkp; ARG 1 options + ARG 2 x + ARG 3 y + ARG 4 width + ARG 5 callback METHOD m_bwrczfzy emptyTooltip ()Lnet/minecraft/unmapped/C_vbibxkxv$C_msgaqezv; METHOD m_ereekstn (Lnet/minecraft/unmapped/C_rdaqiwdt;Ljava/lang/Boolean;)Lnet/minecraft/unmapped/C_rdaqiwdt; ARG 0 text ARG 1 value + METHOD m_ffpjahoa createButton (Lnet/minecraft/unmapped/C_lscptbhn;III)Lnet/minecraft/unmapped/C_kpvuxmkp; + ARG 1 options + ARG 2 x + ARG 3 y + ARG 4 width + METHOD m_fphpxehm (Ljava/lang/Object;)V + ARG 0 callback METHOD m_gdmjalon set (Ljava/lang/Object;)V ARG 1 value METHOD m_gmqoafni ofBoolean (Ljava/lang/String;Lnet/minecraft/unmapped/C_vbibxkxv$C_msgaqezv;Z)Lnet/minecraft/unmapped/C_vbibxkxv; @@ -52,7 +63,7 @@ CLASS net/minecraft/unmapped/C_vbibxkxv net/minecraft/client/option/Option ARG 0 value METHOD m_ocjknhzx optionEnumText ()Lnet/minecraft/unmapped/C_vbibxkxv$C_tunipivd; METHOD m_qbzovuqo (Ljava/lang/Object;)Lnet/minecraft/unmapped/C_skehaijy; - ARG 0 optionValue + ARG 0 value METHOD m_rjfulvkg constantTooltip (Lnet/minecraft/unmapped/C_rdaqiwdt;)Lnet/minecraft/unmapped/C_vbibxkxv$C_msgaqezv; ARG 0 text METHOD m_ryiwnbxv ofBoolean (Ljava/lang/String;Lnet/minecraft/unmapped/C_vbibxkxv$C_msgaqezv;ZLjava/util/function/Consumer;)Lnet/minecraft/unmapped/C_vbibxkxv; @@ -60,6 +71,8 @@ CLASS net/minecraft/unmapped/C_vbibxkxv net/minecraft/client/option/Option ARG 1 tooltipSupplier ARG 2 defaultValue ARG 3 updateCallback + METHOD m_sbzijgoq (Lnet/minecraft/unmapped/C_rdaqiwdt;Ljava/lang/Object;)Lnet/minecraft/unmapped/C_skehaijy; + ARG 1 value METHOD m_snmuxvjl get ()Ljava/lang/Object; COMMENT {@return the value of this option} METHOD m_styjbnrs ofBoolean (Ljava/lang/String;Z)Lnet/minecraft/unmapped/C_vbibxkxv; @@ -119,6 +132,7 @@ CLASS net/minecraft/unmapped/C_vbibxkxv net/minecraft/client/option/Option METHOD m_tfldsxgu maxInclusive ()I CLASS C_msgaqezv TooltipSupplier METHOD apply apply (Ljava/lang/Object;)Lnet/minecraft/unmapped/C_skehaijy; + ARG 1 value CLASS C_obpubvpn EnumValueSet FIELD f_sgsbtixr codec Lcom/mojang/serialization/Codec; FIELD f_zzxbmgjl values Ljava/util/List; @@ -148,7 +162,14 @@ CLASS net/minecraft/unmapped/C_vbibxkxv net/minecraft/client/option/Option FIELD f_pvnzgdpm tooltipSupplier Lnet/minecraft/unmapped/C_vbibxkxv$C_msgaqezv; METHOD (Lnet/minecraft/unmapped/C_lscptbhn;IIIILnet/minecraft/unmapped/C_vbibxkxv;Lnet/minecraft/unmapped/C_vbibxkxv$C_toahngcz;Lnet/minecraft/unmapped/C_vbibxkxv$C_msgaqezv;Ljava/util/function/Consumer;)V ARG 1 options + ARG 2 x + ARG 3 y + ARG 4 width + ARG 5 height + ARG 6 option + ARG 7 values ARG 8 tooltipSupplier + ARG 9 callback CLASS C_utmexptx LazyEnumValueSet FIELD f_acxnfyzk codec Lcom/mojang/serialization/Codec; FIELD f_gvnqdfkt values Ljava/util/function/Supplier; diff --git a/mappings/net/minecraft/client/option/StickyKeyBind.mapping b/mappings/net/minecraft/client/option/StickyKeyBind.mapping index 67dba7d15c..6b5ea3f8cf 100644 --- a/mappings/net/minecraft/client/option/StickyKeyBind.mapping +++ b/mappings/net/minecraft/client/option/StickyKeyBind.mapping @@ -5,3 +5,4 @@ CLASS net/minecraft/unmapped/C_ppppwawd net/minecraft/client/option/StickyKeyBin ARG 2 code ARG 3 category ARG 4 toggleGetter + METHOD m_zdayqktm unpress ()V diff --git a/mappings/net/minecraft/client/render/animation/AnimationKeyframe.mapping b/mappings/net/minecraft/client/render/animation/AnimationKeyframe.mapping index 4683fd0461..a6887f5ba3 100644 --- a/mappings/net/minecraft/client/render/animation/AnimationKeyframe.mapping +++ b/mappings/net/minecraft/client/render/animation/AnimationKeyframe.mapping @@ -1,9 +1,9 @@ CLASS net/minecraft/unmapped/C_dwpbsgze net/minecraft/client/render/animation/AnimationKeyframe FIELD f_eacpcdlp transformation Lorg/joml/Vector3f; - FIELD f_readiqiz interpolator Lnet/minecraft/unmapped/C_vqduzjim$C_nhjvwdgr; + FIELD f_readiqiz interpolation Lnet/minecraft/unmapped/C_vqduzjim$C_nhjvwdgr; FIELD f_tafkshje timestamp F METHOD equals (Ljava/lang/Object;)Z ARG 1 o - METHOD m_hqyosfvx interpolator ()Lnet/minecraft/unmapped/C_vqduzjim$C_nhjvwdgr; + METHOD m_hqyosfvx interpolation ()Lnet/minecraft/unmapped/C_vqduzjim$C_nhjvwdgr; METHOD m_tqjgvicl timestamp ()F METHOD m_uqoliznp transformation ()Lorg/joml/Vector3f; diff --git a/mappings/net/minecraft/client/render/animation/PartAnimation.mapping b/mappings/net/minecraft/client/render/animation/PartAnimation.mapping index 80228ddd5c..fd57aa3ebb 100644 --- a/mappings/net/minecraft/client/render/animation/PartAnimation.mapping +++ b/mappings/net/minecraft/client/render/animation/PartAnimation.mapping @@ -8,7 +8,7 @@ CLASS net/minecraft/unmapped/C_vqduzjim net/minecraft/client/render/animation/Pa ARG 1 o METHOD m_pvdahzek transformation ()Lnet/minecraft/unmapped/C_vqduzjim$C_fuoxfjwf; METHOD m_vqlotjvw keyframes ()[Lnet/minecraft/unmapped/C_dwpbsgze; - CLASS C_dpnvgeww Interpolators + CLASS C_dpnvgeww Interpolations FIELD f_dpfoxzst LINEAR Lnet/minecraft/unmapped/C_vqduzjim$C_nhjvwdgr; FIELD f_zajnogbp SPLINE Lnet/minecraft/unmapped/C_vqduzjim$C_nhjvwdgr; METHOD m_jkixmlrp (Lorg/joml/Vector3f;F[Lnet/minecraft/unmapped/C_dwpbsgze;IIF)Lorg/joml/Vector3f; @@ -29,7 +29,7 @@ CLASS net/minecraft/unmapped/C_vqduzjim net/minecraft/client/render/animation/Pa METHOD apply apply (Lnet/minecraft/unmapped/C_rglqxnbw;Lorg/joml/Vector3f;)V ARG 1 part ARG 2 vector - CLASS C_nhjvwdgr Interpolator + CLASS C_nhjvwdgr Interpolation METHOD apply apply (Lorg/joml/Vector3f;F[Lnet/minecraft/unmapped/C_dwpbsgze;IIF)Lorg/joml/Vector3f; ARG 1 vector ARG 2 delta diff --git a/mappings/net/minecraft/client/render/entity/model/ModelWithWaterPatch.mapping b/mappings/net/minecraft/client/render/entity/model/ModelWithWaterPatch.mapping new file mode 100644 index 0000000000..8fb5e608b6 --- /dev/null +++ b/mappings/net/minecraft/client/render/entity/model/ModelWithWaterPatch.mapping @@ -0,0 +1,2 @@ +CLASS net/minecraft/unmapped/C_uctzoghu net/minecraft/client/render/entity/model/ModelWithWaterPatch + METHOD m_bgyevvdk getWaterPatch ()Lnet/minecraft/unmapped/C_rglqxnbw; diff --git a/mappings/net/minecraft/datafixer/Schemas.mapping b/mappings/net/minecraft/datafixer/Schemas.mapping index 36d3bfc4a4..b97b5ff397 100644 --- a/mappings/net/minecraft/datafixer/Schemas.mapping +++ b/mappings/net/minecraft/datafixer/Schemas.mapping @@ -19,6 +19,8 @@ CLASS net/minecraft/unmapped/C_fdgmxpeq net/minecraft/datafixer/Schemas METHOD m_mantkxly replacing (Ljava/lang/String;Ljava/lang/String;)Ljava/util/function/UnaryOperator; ARG 0 old ARG 1 current + METHOD m_mmkegslj (Ljava/lang/String;)Ljava/lang/String; + ARG 0 id METHOD m_njyysqpn (Ljava/lang/String;)Ljava/lang/String; ARG 0 id METHOD m_smsigeju create (Ljava/util/Set;)Lcom/mojang/datafixers/DataFixer; diff --git a/mappings/net/minecraft/datafixer/fix/StatsCounterFix.mapping b/mappings/net/minecraft/datafixer/fix/StatsCounterFix.mapping index e0b48ae30e..0d45ef3b4d 100644 --- a/mappings/net/minecraft/datafixer/fix/StatsCounterFix.mapping +++ b/mappings/net/minecraft/datafixer/fix/StatsCounterFix.mapping @@ -11,4 +11,9 @@ CLASS net/minecraft/unmapped/C_kbydvftx net/minecraft/datafixer/fix/StatsCounter ARG 1 outputSchema ARG 2 changesType METHOD m_dxoflidq getItem (Ljava/lang/String;)Ljava/lang/String; + ARG 1 oldName METHOD m_gzadlllc getBlock (Ljava/lang/String;)Ljava/lang/String; + ARG 1 oldName + METHOD m_ruoarexh (Lcom/mojang/datafixers/types/Type;Lcom/mojang/datafixers/Typed;)Lcom/mojang/datafixers/Typed; + ARG 2 typed + METHOD makeRule makeRule ()Lcom/mojang/datafixers/TypeRewriteRule; diff --git a/mappings/net/minecraft/sound/BiomeAdditionsSound.mapping b/mappings/net/minecraft/sound/BiomeAdditionsSound.mapping index c0ffc92578..36cdb11f5c 100644 --- a/mappings/net/minecraft/sound/BiomeAdditionsSound.mapping +++ b/mappings/net/minecraft/sound/BiomeAdditionsSound.mapping @@ -3,8 +3,15 @@ CLASS net/minecraft/unmapped/C_pcdkepep net/minecraft/sound/BiomeAdditionsSound FIELD f_dialhoon chance D FIELD f_fcpqxhql CODEC Lcom/mojang/serialization/Codec; FIELD f_ruancaxe sound Lnet/minecraft/unmapped/C_cjzoxshv; + METHOD (Lnet/minecraft/unmapped/C_cjzoxshv;D)V + ARG 1 sound + ARG 2 chance METHOD m_atfznkya (Lcom/mojang/serialization/codecs/RecordCodecBuilder$Instance;)Lcom/mojang/datafixers/kinds/App; ARG 0 instance + METHOD m_epsddqhs (Lnet/minecraft/unmapped/C_pcdkepep;)Lnet/minecraft/unmapped/C_cjzoxshv; + ARG 0 additionsSound METHOD m_kpmvtrvx getChance ()D COMMENT Returns the chance of this addition sound to play at any tick. METHOD m_tohfnsnd getSound ()Lnet/minecraft/unmapped/C_cjzoxshv; + METHOD m_ylvesyuu (Lnet/minecraft/unmapped/C_pcdkepep;)Ljava/lang/Double; + ARG 0 additionsSound diff --git a/mappings/net/minecraft/sound/BiomeMoodSound.mapping b/mappings/net/minecraft/sound/BiomeMoodSound.mapping index cda4f0837c..403d63143d 100644 --- a/mappings/net/minecraft/sound/BiomeMoodSound.mapping +++ b/mappings/net/minecraft/sound/BiomeMoodSound.mapping @@ -5,6 +5,15 @@ CLASS net/minecraft/unmapped/C_pywtusyz net/minecraft/sound/BiomeMoodSound FIELD f_pislysuu CODEC Lcom/mojang/serialization/Codec; FIELD f_ryhcvdes spawnRange I FIELD f_ukchfvnj cultivationTicks I + METHOD (Lnet/minecraft/unmapped/C_cjzoxshv;IID)V + ARG 1 sound + ARG 2 cultivationTicks + ARG 3 spawnRange + ARG 4 extraDistance + METHOD m_cdgxfykb (Lnet/minecraft/unmapped/C_pywtusyz;)Lnet/minecraft/unmapped/C_cjzoxshv; + ARG 0 moodSound + METHOD m_ewxujoye (Lnet/minecraft/unmapped/C_pywtusyz;)Ljava/lang/Integer; + ARG 0 moodSound METHOD m_fulseots getExtraDistance ()D COMMENT Returns the extra distance of the sound from the player when the sound COMMENT plays from the mood position. @@ -18,7 +27,11 @@ CLASS net/minecraft/unmapped/C_pywtusyz net/minecraft/sound/BiomeMoodSound COMMENT the player. METHOD m_hgfsqmyk (Lcom/mojang/serialization/codecs/RecordCodecBuilder$Instance;)Lcom/mojang/datafixers/kinds/App; ARG 0 instance + METHOD m_ivdgcszz (Lnet/minecraft/unmapped/C_pywtusyz;)Ljava/lang/Double; + ARG 0 moodSound METHOD m_kqwzyipi getCultivationTicks ()I COMMENT Returns the ticks it takes for entering the mood environment (a totally COMMENT dark cave) to playing the mood sound, or the inverse of the per-tick. METHOD m_tjeqxsqf getSound ()Lnet/minecraft/unmapped/C_cjzoxshv; + METHOD m_wadyfobe (Lnet/minecraft/unmapped/C_pywtusyz;)Ljava/lang/Integer; + ARG 0 moodSound diff --git a/mappings/net/minecraft/stat/Stat.mapping b/mappings/net/minecraft/stat/Stat.mapping index 44b344c2a1..324d3b623c 100644 --- a/mappings/net/minecraft/stat/Stat.mapping +++ b/mappings/net/minecraft/stat/Stat.mapping @@ -16,3 +16,4 @@ CLASS net/minecraft/unmapped/C_sibrxbfy net/minecraft/stat/Stat ARG 0 type ARG 1 value METHOD m_wxkuukrw format (I)Ljava/lang/String; + ARG 1 value diff --git a/mappings/net/minecraft/stat/StatFormatter.mapping b/mappings/net/minecraft/stat/StatFormatter.mapping index af7dd5b2f0..464915ee3a 100644 --- a/mappings/net/minecraft/stat/StatFormatter.mapping +++ b/mappings/net/minecraft/stat/StatFormatter.mapping @@ -4,3 +4,13 @@ CLASS net/minecraft/unmapped/C_eihuzrnt net/minecraft/stat/StatFormatter FIELD f_qmmgtxnp TIME Lnet/minecraft/unmapped/C_eihuzrnt; FIELD f_talzpsck DIVIDE_BY_TEN Lnet/minecraft/unmapped/C_eihuzrnt; FIELD f_zmcftunq DECIMAL_FORMAT Ljava/text/DecimalFormat; + METHOD format format (I)Ljava/lang/String; + ARG 1 value + METHOD m_czjxpyxb (Ljava/text/DecimalFormat;)V + ARG 0 decimalFormat + METHOD m_fvtczhcn (I)Ljava/lang/String; + ARG 0 value + METHOD m_jjtymmdt (I)Ljava/lang/String; + ARG 0 value + METHOD m_sssxwsfu (I)Ljava/lang/String; + ARG 0 value diff --git a/mappings/net/minecraft/util/CommonColors.mapping b/mappings/net/minecraft/util/CommonColors.mapping index d7b2d9c25f..51b717d2e3 100644 --- a/mappings/net/minecraft/util/CommonColors.mapping +++ b/mappings/net/minecraft/util/CommonColors.mapping @@ -6,3 +6,5 @@ CLASS net/minecraft/unmapped/C_oauvuath net/minecraft/util/CommonColors COMMENT The black color whose value is {@value}. FIELD f_qlmrjxqb WHITE I COMMENT The white color whose value is {@value}. + FIELD f_vzujugkt GRAY I + COMMENT The gray color whose value is {@value}. diff --git a/mappings/net/minecraft/util/JsonHelper.mapping b/mappings/net/minecraft/util/JsonHelper.mapping index 1383f3cbb8..d0cadf4703 100644 --- a/mappings/net/minecraft/util/JsonHelper.mapping +++ b/mappings/net/minecraft/util/JsonHelper.mapping @@ -138,6 +138,9 @@ CLASS net/minecraft/unmapped/C_qtbzyiey net/minecraft/util/JsonHelper ARG 0 object ARG 1 element ARG 2 defaultBigInteger + METHOD m_onmszsha getElementOrThrow (Lcom/google/gson/JsonObject;Ljava/lang/String;)Lcom/google/gson/JsonElement; + ARG 0 object + ARG 1 element METHOD m_owrroppv deserialize (Lcom/google/gson/JsonElement;Ljava/lang/String;Lcom/google/gson/JsonDeserializationContext;Ljava/lang/Class;)Ljava/lang/Object; ARG 0 element ARG 1 name diff --git a/mappings/net/minecraft/util/SimpleBitStorage.mapping b/mappings/net/minecraft/util/SimpleBitStorage.mapping index d825895b7b..68817ae271 100644 --- a/mappings/net/minecraft/util/SimpleBitStorage.mapping +++ b/mappings/net/minecraft/util/SimpleBitStorage.mapping @@ -11,6 +11,9 @@ CLASS net/minecraft/unmapped/C_jvntkmjh net/minecraft/util/SimpleBitStorage METHOD (II)V ARG 1 bits ARG 2 size + METHOD (II[I)V + ARG 1 bits + ARG 2 size METHOD (II[J)V ARG 1 bits ARG 2 size diff --git a/mappings/net/minecraft/util/Util.mapping b/mappings/net/minecraft/util/Util.mapping index 228e675f3f..de04af3716 100644 --- a/mappings/net/minecraft/util/Util.mapping +++ b/mappings/net/minecraft/util/Util.mapping @@ -238,3 +238,5 @@ CLASS net/minecraft/unmapped/C_lvarvugc net/minecraft/util/Util FIELD f_boyitqoh cache Ljava/util/Map; METHOD apply apply (Ljava/lang/Object;)Ljava/lang/Object; CLASS C_uzjrvfhh IdentityHashStrategy + CLASS C_vroykftd + METHOD getAsBoolean getAsBoolean ()Z diff --git a/mappings/net/minecraft/util/ZipCompressor.mapping b/mappings/net/minecraft/util/ZipCompressor.mapping index 303752c9af..8275b6bb95 100644 --- a/mappings/net/minecraft/util/ZipCompressor.mapping +++ b/mappings/net/minecraft/util/ZipCompressor.mapping @@ -14,6 +14,7 @@ CLASS net/minecraft/unmapped/C_uzqkakwa net/minecraft/util/ZipCompressor COMMENT Creates a ZIP compressor. ARG 1 file COMMENT the path of the ZIP file + METHOD close close ()V METHOD m_iztvfpil copyAll (Ljava/nio/file/Path;)V COMMENT Copies the {@code source} file or directory to the root of the ZIP. ARG 1 source diff --git a/mappings/net/minecraft/util/dynamic/Codecs.mapping b/mappings/net/minecraft/util/dynamic/Codecs.mapping index f6e5340469..4710c1fc82 100644 --- a/mappings/net/minecraft/util/dynamic/Codecs.mapping +++ b/mappings/net/minecraft/util/dynamic/Codecs.mapping @@ -98,6 +98,8 @@ CLASS net/minecraft/unmapped/C_tyjpezxh net/minecraft/util/dynamic/Codecs ARG 3 combineFunction ARG 4 leftFunction ARG 5 rightFunction + METHOD m_pqmgxbkr (Lnet/minecraft/unmapped/C_rdaqiwdt;)Lcom/mojang/serialization/DataResult; + ARG 0 text METHOD m_sltnwzrc createRangedFloat (FFLjava/util/function/Function;)Lcom/mojang/serialization/Codec; ARG 0 min ARG 1 max diff --git a/mappings/net/minecraft/world/MobSpawnerEntry.mapping b/mappings/net/minecraft/world/MobSpawnerEntry.mapping index 0b92fb8e5a..6812b4688b 100644 --- a/mappings/net/minecraft/world/MobSpawnerEntry.mapping +++ b/mappings/net/minecraft/world/MobSpawnerEntry.mapping @@ -30,6 +30,10 @@ CLASS net/minecraft/unmapped/C_edcjbljn net/minecraft/world/MobSpawnerEntry METHOD equals (Ljava/lang/Object;)Z ARG 1 o METHOD m_akjnrhmf blockLightLimit ()Lnet/minecraft/unmapped/C_uydqwobg; + METHOD m_gtsdxghy (Lnet/minecraft/unmapped/C_edcjbljn$C_jzmzunnv;)Lnet/minecraft/unmapped/C_uydqwobg; + ARG 0 rules + METHOD m_hddzblya (Lcom/mojang/serialization/codecs/RecordCodecBuilder$Instance;)Lcom/mojang/datafixers/kinds/App; + ARG 0 instance METHOD m_hqvizrhc (Lnet/minecraft/unmapped/C_edcjbljn$C_jzmzunnv;)Lnet/minecraft/unmapped/C_uydqwobg; ARG 0 rules METHOD m_onzhgifd validate (Lnet/minecraft/unmapped/C_uydqwobg;)Lcom/mojang/serialization/DataResult;