Skip to content

Commit

Permalink
Randomly map stuff again! (Refactor Edition) (#445)
Browse files Browse the repository at this point in the history 
* 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>
  • Loading branch information
@EnnuiL @github-actions
EnnuiL and github-actions[bot] committed Jun 17, 2023
1 parent e394d29 commit e16794a
Show file tree
Hide file tree
Showing 27 changed files with 146 additions and 13 deletions.
2 changes: 2 additions & 0 deletions mappings/com/mojang/blaze3d/glfw/Window.mapping
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion mappings/net/minecraft/block/CropBlock.mapping
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
5 changes: 3 additions & 2 deletions mappings/net/minecraft/block/Fertilizable.mapping
View file
Original file line number Diff line number Diff line change
@@ -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
Expand Down
4 changes: 4 additions & 0 deletions mappings/net/minecraft/block/FungusBlock.mapping
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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 <init> (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
26 changes: 26 additions & 0 deletions mappings/net/minecraft/block/PitcherCropBlock.mapping
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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;
2 changes: 1 addition & 1 deletion mappings/net/minecraft/client/MinecraftClient.mapping
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 3 additions & 1 deletion mappings/net/minecraft/client/network/ClientPlayerEntity.mapping
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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 <init> (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
Expand Down Expand Up @@ -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
20 changes: 19 additions & 1 deletion mappings/net/minecraft/client/option/GameOptions.mapping
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -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 <init> (Lnet/minecraft/unmapped/C_ayfeobid;Ljava/io/File;)V
Expand All @@ -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;
Expand Down Expand Up @@ -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;
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand All @@ -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;
Expand All @@ -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
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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;
Expand Down
3 changes: 2 additions & 1 deletion mappings/net/minecraft/client/option/KeyBind.mapping
View file
Original file line number Diff line number Diff line change
Expand Up @@ -41,14 +41,15 @@ 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
ARG 1 pressed
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
Expand Down
25 changes: 23 additions & 2 deletions mappings/net/minecraft/client/option/Option.mapping
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand All @@ -52,14 +63,16 @@ 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;
ARG 0 key
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;
Expand Down Expand Up @@ -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;
Expand Down Expand Up @@ -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 <init> (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;
Expand Down
1 change: 1 addition & 0 deletions mappings/net/minecraft/client/option/StickyKeyBind.mapping
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
4 changes: 2 additions & 2 deletions mappings/net/minecraft/client/render/animation/AnimationKeyframe.mapping
View file
Original file line number Diff line number Diff line change
@@ -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;
4 changes: 2 additions & 2 deletions mappings/net/minecraft/client/render/animation/PartAnimation.mapping
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand All @@ -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
Expand Down
2 changes: 2 additions & 0 deletions mappings/net/minecraft/client/render/entity/model/ModelWithWaterPatch.mapping
View file
Original file line number Diff line number Diff line change
@@ -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;
2 changes: 2 additions & 0 deletions mappings/net/minecraft/datafixer/Schemas.mapping
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
5 changes: 5 additions & 0 deletions mappings/net/minecraft/datafixer/fix/StatsCounterFix.mapping
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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;
7 changes: 7 additions & 0 deletions mappings/net/minecraft/sound/BiomeAdditionsSound.mapping
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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 <init> (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
Loading

3 comments on commit e16794a

@github-actions
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

With commit e16794a, 81 file(s) were updated with 1800 line(s) added and 1778 removed compared to the latest Quilt Mappings version.

View the diff here (1/3): 
diff -bur namedTargetSrc/com/mojang/blaze3d/glfw/Window.java namedSrc/com/mojang/blaze3d/glfw/Window.java
--- namedTargetSrc/com/mojang/blaze3d/glfw/Window.java	2023-06-17 19:46:16.671810092 +0000
+++ namedSrc/com/mojang/blaze3d/glfw/Window.java	2023-06-17 19:44:25.802215403 +0000
@@ -264,12 +264,12 @@
     * @mapping {@literal hashed m_tmxadezh Lnet/minecraft/unmapped/C_snosbckc;m_tmxadezh(Lnet/minecraft/unmapped/C_tguinuvn;Lnet/minecraft/unmapped/C_xksdrgbg;)V}
     * @mapping {@literal named setIcon Lcom/mojang/blaze3d/glfw/Window;setIcon(Lnet/minecraft/resource/pack/ResourcePack;Lnet/minecraft/client/util/WindowIcons;)V}
     */
-   public void setIcon(ResourcePack resourcePack, WindowIcons icon) throws IOException {
+   public void setIcon(ResourcePack pack, WindowIcons icon) throws IOException {
       RenderSystem.assertInInitPhase();
       if (MinecraftClient.IS_SYSTEM_MAC) {
-         MacWindowUtil.setMacOsIcon(icon.getMacOsIcon(resourcePack));
+         MacWindowUtil.setMacOsIcon(icon.getMacOsIcon(pack));
       } else {
-         List<ResourceIoSupplier<InputStream>> list = icon.getIcons(resourcePack);
+         List<ResourceIoSupplier<InputStream>> list = icon.getIcons(pack);
          List<ByteBuffer> list2 = new ArrayList(list.size());
 
          try (MemoryStack memoryStack = MemoryStack.stackPush()) {
@@ -358,7 +358,8 @@
    }
 
    /**
-    * Mapping not found
+    * @mapping {@literal hashed close Lnet/minecraft/unmapped/C_snosbckc;close()V}
+    * @mapping {@literal named close Lcom/mojang/blaze3d/glfw/Window;close()V}
     */
    public void close() {
       RenderSystem.assertOnRenderThread();
diff -bur namedTargetSrc/net/minecraft/block/AbstractPlantBlock.java namedSrc/net/minecraft/block/AbstractPlantBlock.java
--- namedTargetSrc/net/minecraft/block/AbstractPlantBlock.java	2023-06-17 19:46:16.611807120 +0000
+++ namedSrc/net/minecraft/block/AbstractPlantBlock.java	2023-06-17 19:44:25.734211662 +0000
@@ -79,7 +79,7 @@
     * Mapping not found
     */
    @Override
-   public boolean canGrow(World world, RandomGenerator random, BlockPos pos, BlockState state) {
+   public boolean canFertilize(World world, RandomGenerator random, BlockPos pos, BlockState state) {
       return true;
    }
 
@@ -87,11 +87,11 @@
     * Mapping not found
     */
    @Override
-   public void grow(ServerWorld world, RandomGenerator random, BlockPos pos, BlockState state) {
+   public void fertilize(ServerWorld world, RandomGenerator random, BlockPos pos, BlockState state) {
       Optional<BlockPos> optional = this.getStemHeadPos(world, pos, state.getBlock());
       if (optional.isPresent()) {
          BlockState lv = world.getBlockState((BlockPos)optional.get());
-         ((AbstractPlantStemBlock)lv.getBlock()).grow(world, random, (BlockPos)optional.get(), lv);
+         ((AbstractPlantStemBlock)lv.getBlock()).fertilize(world, random, (BlockPos)optional.get(), lv);
       }
    }
 
diff -bur namedTargetSrc/net/minecraft/block/AbstractPlantStemBlock.java namedSrc/net/minecraft/block/AbstractPlantStemBlock.java
--- namedTargetSrc/net/minecraft/block/AbstractPlantStemBlock.java	2023-06-17 19:46:16.727812866 +0000
+++ namedSrc/net/minecraft/block/AbstractPlantStemBlock.java	2023-06-17 19:44:25.878219585 +0000
@@ -147,7 +147,7 @@
     * Mapping not found
     */
    @Override
-   public boolean canGrow(World world, RandomGenerator random, BlockPos pos, BlockState state) {
+   public boolean canFertilize(World world, RandomGenerator random, BlockPos pos, BlockState state) {
       return true;
    }
 
@@ -155,7 +155,7 @@
     * Mapping not found
     */
    @Override
-   public void grow(ServerWorld world, RandomGenerator random, BlockPos pos, BlockState state) {
+   public void fertilize(ServerWorld world, RandomGenerator random, BlockPos pos, BlockState state) {
       BlockPos lv = pos.offset(this.growthDirection);
       int i = Math.min(state.get(AGE) + 1, 25);
       int j = this.getGrowthLength(random);
diff -bur namedTargetSrc/net/minecraft/block/AzaleaBlock.java namedSrc/net/minecraft/block/AzaleaBlock.java
--- namedTargetSrc/net/minecraft/block/AzaleaBlock.java	2023-06-17 19:46:16.739813461 +0000
+++ namedSrc/net/minecraft/block/AzaleaBlock.java	2023-06-17 19:44:25.890220246 +0000
@@ -63,7 +63,7 @@
     * Mapping not found
     */
    @Override
-   public boolean canGrow(World world, RandomGenerator random, BlockPos pos, BlockState state) {
+   public boolean canFertilize(World world, RandomGenerator random, BlockPos pos, BlockState state) {
       return (double)world.random.nextFloat() < 0.45;
    }
 
@@ -71,7 +71,7 @@
     * Mapping not found
     */
    @Override
-   public void grow(ServerWorld world, RandomGenerator random, BlockPos pos, BlockState state) {
+   public void fertilize(ServerWorld world, RandomGenerator random, BlockPos pos, BlockState state) {
       GENERATOR.generate(world, world.getChunkManager().getChunkGenerator(), pos, state, random);
    }
 }
diff -bur namedTargetSrc/net/minecraft/block/BambooBlock.java namedSrc/net/minecraft/block/BambooBlock.java
--- namedTargetSrc/net/minecraft/block/BambooBlock.java	2023-06-17 19:46:16.631808111 +0000
+++ namedSrc/net/minecraft/block/BambooBlock.java	2023-06-17 19:44:25.758212982 +0000
@@ -258,7 +258,7 @@
     * Mapping not found
     */
    @Override
-   public boolean canGrow(World world, RandomGenerator random, BlockPos pos, BlockState state) {
+   public boolean canFertilize(World world, RandomGenerator random, BlockPos pos, BlockState state) {
       return true;
    }
 
@@ -266,7 +266,7 @@
     * Mapping not found
     */
    @Override
-   public void grow(ServerWorld world, RandomGenerator random, BlockPos pos, BlockState state) {
+   public void fertilize(ServerWorld world, RandomGenerator random, BlockPos pos, BlockState state) {
       int i = this.countBambooAbove(world, pos);
       int j = this.countBambooBelow(world, pos);
       int k = i + j + 1;
diff -bur namedTargetSrc/net/minecraft/block/BambooSaplingBlock.java namedSrc/net/minecraft/block/BambooSaplingBlock.java
--- namedTargetSrc/net/minecraft/block/BambooSaplingBlock.java	2023-06-17 19:46:16.719812470 +0000
+++ namedSrc/net/minecraft/block/BambooSaplingBlock.java	2023-06-17 19:44:25.866218925 +0000
@@ -105,7 +105,7 @@
     * Mapping not found
     */
    @Override
-   public boolean canGrow(World world, RandomGenerator random, BlockPos pos, BlockState state) {
+   public boolean canFertilize(World world, RandomGenerator random, BlockPos pos, BlockState state) {
       return true;
    }
 
@@ -113,7 +113,7 @@
     * Mapping not found
     */
    @Override
-   public void grow(ServerWorld world, RandomGenerator random, BlockPos pos, BlockState state) {
+   public void fertilize(ServerWorld world, RandomGenerator random, BlockPos pos, BlockState state) {
       this.grow(world, pos);
    }
 
diff -bur namedTargetSrc/net/minecraft/block/BigDripleafBlock.java namedSrc/net/minecraft/block/BigDripleafBlock.java
--- namedTargetSrc/net/minecraft/block/BigDripleafBlock.java	2023-06-17 19:46:16.695811281 +0000
+++ namedSrc/net/minecraft/block/BigDripleafBlock.java	2023-06-17 19:44:25.838217384 +0000
@@ -254,7 +254,7 @@
     * Mapping not found
     */
    @Override
-   public boolean canGrow(World world, RandomGenerator random, BlockPos pos, BlockState state) {
+   public boolean canFertilize(World world, RandomGenerator random, BlockPos pos, BlockState state) {
       return true;
    }
 
@@ -262,7 +262,7 @@
     * Mapping not found
     */
    @Override
-   public void grow(ServerWorld world, RandomGenerator random, BlockPos pos, BlockState state) {
+   public void fertilize(ServerWorld world, RandomGenerator random, BlockPos pos, BlockState state) {
       BlockPos lv = pos.up();
       BlockState lv2 = world.getBlockState(lv);
       if (canGrowInto(world, lv, lv2)) {
diff -bur namedTargetSrc/net/minecraft/block/BigDripleafStemBlock.java namedSrc/net/minecraft/block/BigDripleafStemBlock.java
--- namedTargetSrc/net/minecraft/block/BigDripleafStemBlock.java	2023-06-17 19:46:16.663809696 +0000
+++ namedSrc/net/minecraft/block/BigDripleafStemBlock.java	2023-06-17 19:44:25.794214963 +0000
@@ -167,7 +167,7 @@
     * Mapping not found
     */
    @Override
-   public boolean canGrow(World world, RandomGenerator random, BlockPos pos, BlockState state) {
+   public boolean canFertilize(World world, RandomGenerator random, BlockPos pos, BlockState state) {
       return true;
    }
 
@@ -175,7 +175,7 @@
     * Mapping not found
     */
    @Override
-   public void grow(ServerWorld world, RandomGenerator random, BlockPos pos, BlockState state) {
+   public void fertilize(ServerWorld world, RandomGenerator random, BlockPos pos, BlockState state) {
       Optional<BlockPos> optional = BlockLocating.findColumnEnd(world, pos, state.getBlock(), Direction.UP, Blocks.BIG_DRIPLEAF);
       if (optional.isPresent()) {
          BlockPos lv = (BlockPos)optional.get();
diff -bur namedTargetSrc/net/minecraft/block/CaveVinesBodyBlock.java namedSrc/net/minecraft/block/CaveVinesBodyBlock.java
--- namedTargetSrc/net/minecraft/block/CaveVinesBodyBlock.java	2023-06-17 19:46:16.755814254 +0000
+++ namedSrc/net/minecraft/block/CaveVinesBodyBlock.java	2023-06-17 19:44:25.910221346 +0000
@@ -80,7 +80,7 @@
     * Mapping not found
     */
    @Override
-   public boolean canGrow(World world, RandomGenerator random, BlockPos pos, BlockState state) {
+   public boolean canFertilize(World world, RandomGenerator random, BlockPos pos, BlockState state) {
       return true;
    }
 
@@ -88,7 +88,7 @@
     * Mapping not found
     */
    @Override
-   public void grow(ServerWorld world, RandomGenerator random, BlockPos pos, BlockState state) {
+   public void fertilize(ServerWorld world, RandomGenerator random, BlockPos pos, BlockState state) {
       world.setBlockState(pos, state.with(BERRIES, Boolean.valueOf(true)), Block.NOTIFY_LISTENERS);
    }
 }
diff -bur namedTargetSrc/net/minecraft/block/CaveVinesHeadBlock.java namedSrc/net/minecraft/block/CaveVinesHeadBlock.java
--- namedTargetSrc/net/minecraft/block/CaveVinesHeadBlock.java	2023-06-17 19:46:16.631808111 +0000
+++ namedSrc/net/minecraft/block/CaveVinesHeadBlock.java	2023-06-17 19:44:25.758212982 +0000
@@ -111,7 +111,7 @@
     * Mapping not found
     */
    @Override
-   public boolean canGrow(World world, RandomGenerator random, BlockPos pos, BlockState state) {
+   public boolean canFertilize(World world, RandomGenerator random, BlockPos pos, BlockState state) {
       return true;
    }
 
@@ -119,7 +119,7 @@
     * Mapping not found
     */
    @Override
-   public void grow(ServerWorld world, RandomGenerator random, BlockPos pos, BlockState state) {
+   public void fertilize(ServerWorld world, RandomGenerator random, BlockPos pos, BlockState state) {
       world.setBlockState(pos, state.with(BERRIES, Boolean.valueOf(true)), Block.NOTIFY_LISTENERS);
    }
 }
diff -bur namedTargetSrc/net/minecraft/block/CocoaBlock.java namedSrc/net/minecraft/block/CocoaBlock.java
--- namedTargetSrc/net/minecraft/block/CocoaBlock.java	2023-06-17 19:46:16.635808309 +0000
+++ namedSrc/net/minecraft/block/CocoaBlock.java	2023-06-17 19:44:25.762213202 +0000
@@ -217,7 +217,7 @@
     * Mapping not found
     */
    @Override
-   public boolean canGrow(World world, RandomGenerator random, BlockPos pos, BlockState state) {
+   public boolean canFertilize(World world, RandomGenerator random, BlockPos pos, BlockState state) {
       return true;
    }
 
@@ -225,7 +225,7 @@
     * Mapping not found
     */
    @Override
-   public void grow(ServerWorld world, RandomGenerator random, BlockPos pos, BlockState state) {
+   public void fertilize(ServerWorld world, RandomGenerator random, BlockPos pos, BlockState state) {
       world.setBlockState(pos, state.with(AGE, Integer.valueOf(state.get(AGE) + 1)), Block.NOTIFY_LISTENERS);
    }
 
diff -bur namedTargetSrc/net/minecraft/block/CropBlock.java namedSrc/net/minecraft/block/CropBlock.java
--- namedTargetSrc/net/minecraft/block/CropBlock.java	2023-06-17 19:46:16.603806724 +0000
+++ namedSrc/net/minecraft/block/CropBlock.java	2023-06-17 19:44:25.718210781 +0000
@@ -138,9 +138,9 @@
 
    /**
     * @mapping {@literal hashed m_zueyanzo Lnet/minecraft/unmapped/C_rhzoiqkd;m_zueyanzo(Lnet/minecraft/unmapped/C_cdctfzbn;Lnet/minecraft/unmapped/C_hynzadkk;Lnet/minecraft/unmapped/C_txtbiemp;)V}
-    * @mapping {@literal named applyGrowth Lnet/minecraft/block/CropBlock;applyGrowth(Lnet/minecraft/world/World;Lnet/minecraft/util/math/BlockPos;Lnet/minecraft/block/BlockState;)V}
+    * @mapping {@literal named grow Lnet/minecraft/block/CropBlock;grow(Lnet/minecraft/world/World;Lnet/minecraft/util/math/BlockPos;Lnet/minecraft/block/BlockState;)V}
     */
-   public void applyGrowth(World world, BlockPos pos, BlockState state) {
+   public void grow(World world, BlockPos pos, BlockState state) {
       int i = this.getAge(state) + this.getGrowthAmount(world);
       int j = this.getMaxAge();
       if (i > j) {
@@ -254,7 +254,7 @@
     * Mapping not found
     */
    @Override
-   public boolean canGrow(World world, RandomGenerator random, BlockPos pos, BlockState state) {
+   public boolean canFertilize(World world, RandomGenerator random, BlockPos pos, BlockState state) {
       return true;
    }
 
@@ -262,8 +262,8 @@
     * Mapping not found
     */
    @Override
-   public void grow(ServerWorld world, RandomGenerator random, BlockPos pos, BlockState state) {
-      this.applyGrowth(world, pos, state);
+   public void fertilize(ServerWorld world, RandomGenerator random, BlockPos pos, BlockState state) {
+      this.grow(world, pos, state);
    }
 
    /**
diff -bur namedTargetSrc/net/minecraft/block/FernBlock.java namedSrc/net/minecraft/block/FernBlock.java
--- namedTargetSrc/net/minecraft/block/FernBlock.java	2023-06-17 19:46:16.607806922 +0000
+++ namedSrc/net/minecraft/block/FernBlock.java	2023-06-17 19:44:25.722211001 +0000
@@ -51,7 +51,7 @@
     * Mapping not found
     */
    @Override
-   public boolean canGrow(World world, RandomGenerator random, BlockPos pos, BlockState state) {
+   public boolean canFertilize(World world, RandomGenerator random, BlockPos pos, BlockState state) {
       return true;
    }
 
@@ -59,7 +59,7 @@
     * Mapping not found
     */
    @Override
-   public void grow(ServerWorld world, RandomGenerator random, BlockPos pos, BlockState state) {
+   public void fertilize(ServerWorld world, RandomGenerator random, BlockPos pos, BlockState state) {
       TallPlantBlock lv = (TallPlantBlock)(state.isOf(Blocks.FERN) ? Blocks.LARGE_FERN : Blocks.TALL_GRASS);
       if (lv.getDefaultState().canPlaceAt(world, pos) && world.isAir(pos.up())) {
          TallPlantBlock.placeAt(world, lv.getDefaultState(), pos, 2);
diff -bur namedTargetSrc/net/minecraft/block/Fertilizable.java namedSrc/net/minecraft/block/Fertilizable.java
--- namedTargetSrc/net/minecraft/block/Fertilizable.java	2023-06-17 19:46:16.779815442 +0000
+++ namedSrc/net/minecraft/block/Fertilizable.java	2023-06-17 19:44:25.938222887 +0000
@@ -19,13 +19,13 @@
 
    /**
     * @mapping {@literal hashed m_mxdrxjjx Lnet/minecraft/unmapped/C_svvihwsq;m_mxdrxjjx(Lnet/minecraft/unmapped/C_cdctfzbn;Lnet/minecraft/unmapped/C_rlomrsco;Lnet/minecraft/unmapped/C_hynzadkk;Lnet/minecraft/unmapped/C_txtbiemp;)Z}
-    * @mapping {@literal named canGrow Lnet/minecraft/block/Fertilizable;canGrow(Lnet/minecraft/world/World;Lnet/minecraft/util/random/RandomGenerator;Lnet/minecraft/util/math/BlockPos;Lnet/minecraft/block/BlockState;)Z}
+    * @mapping {@literal named canFertilize Lnet/minecraft/block/Fertilizable;canFertilize(Lnet/minecraft/world/World;Lnet/minecraft/util/random/RandomGenerator;Lnet/minecraft/util/math/BlockPos;Lnet/minecraft/block/BlockState;)Z}
     */
-   boolean canGrow(World world, RandomGenerator random, BlockPos pos, BlockState state);
+   boolean canFertilize(World world, RandomGenerator random, BlockPos pos, BlockState state);
 
    /**
     * @mapping {@literal hashed m_tbosypih Lnet/minecraft/unmapped/C_svvihwsq;m_tbosypih(Lnet/minecraft/unmapped/C_bdwnwhiu;Lnet/minecraft/unmapped/C_rlomrsco;Lnet/minecraft/unmapped/C_hynzadkk;Lnet/minecraft/unmapped/C_txtbiemp;)V}
-    * @mapping {@literal named grow Lnet/minecraft/block/Fertilizable;grow(Lnet/minecraft/server/world/ServerWorld;Lnet/minecraft/util/random/RandomGenerator;Lnet/minecraft/util/math/BlockPos;Lnet/minecraft/block/BlockState;)V}
+    * @mapping {@literal named fertilize Lnet/minecraft/block/Fertilizable;fertilize(Lnet/minecraft/server/world/ServerWorld;Lnet/minecraft/util/random/RandomGenerator;Lnet/minecraft/util/math/BlockPos;Lnet/minecraft/block/BlockState;)V}
     */
-   void grow(ServerWorld world, RandomGenerator random, BlockPos pos, BlockState state);
+   void fertilize(ServerWorld world, RandomGenerator random, BlockPos pos, BlockState state);
 }
diff -bur namedTargetSrc/net/minecraft/block/FungusBlock.java namedSrc/net/minecraft/block/FungusBlock.java
--- namedTargetSrc/net/minecraft/block/FungusBlock.java	2023-06-17 19:46:16.763814650 +0000
+++ namedSrc/net/minecraft/block/FungusBlock.java	2023-06-17 19:44:25.918221786 +0000
@@ -31,9 +31,9 @@
    private static final double GROW_CHANCE = 0.4;
    /**
     * @mapping {@literal hashed f_kvrossnb Lnet/minecraft/unmapped/C_naobsnoy;f_kvrossnb:Lnet/minecraft/unmapped/C_mmxmpdoq;}
-    * @mapping {@literal named block Lnet/minecraft/block/FungusBlock;block:Lnet/minecraft/block/Block;}
+    * @mapping {@literal named requiredGroundBlock Lnet/minecraft/block/FungusBlock;requiredGroundBlock:Lnet/minecraft/block/Block;}
     */
-   private final Block block;
+   private final Block requiredGroundBlock;
    /**
     * @mapping {@literal hashed f_cyyobiev Lnet/minecraft/unmapped/C_naobsnoy;f_cyyobiev:Lnet/minecraft/unmapped/C_xhhleach;}
     * @mapping {@literal named feature Lnet/minecraft/block/FungusBlock;feature:Lnet/minecraft/registry/RegistryKey;}
@@ -44,10 +44,10 @@
     * @mapping {@literal hashed <init> Lnet/minecraft/unmapped/C_naobsnoy;<init>(Lnet/minecraft/unmapped/C_triydqro$C_xnkxsdfy;Lnet/minecraft/unmapped/C_xhhleach;Lnet/minecraft/unmapped/C_mmxmpdoq;)V}
     * @mapping {@literal named <init> Lnet/minecraft/block/FungusBlock;<init>(Lnet/minecraft/block/AbstractBlock$Settings;Lnet/minecraft/registry/RegistryKey;Lnet/minecraft/block/Block;)V}
     */
-   protected FungusBlock(AbstractBlock.Settings settings, RegistryKey<ConfiguredFeature<?, ?>> registryKey, Block block) {
+   protected FungusBlock(AbstractBlock.Settings settings, RegistryKey<ConfiguredFeature<?, ?>> feature, Block requiredGroundBlock) {
       super(settings);
-      this.feature = registryKey;
-      this.block = block;
+      this.feature = feature;
+      this.requiredGroundBlock = requiredGroundBlock;
    }
 
    /**
@@ -80,14 +80,14 @@
    @Override
    public boolean isFertilizable(WorldView world, BlockPos pos, BlockState state, boolean isClient) {
       BlockState lv = world.getBlockState(pos.down());
-      return lv.isOf(this.block);
+      return lv.isOf(this.requiredGroundBlock);
    }
 
    /**
     * Mapping not found
     */
    @Override
-   public boolean canGrow(World world, RandomGenerator random, BlockPos pos, BlockState state) {
+   public boolean canFertilize(World world, RandomGenerator random, BlockPos pos, BlockState state) {
       return (double)random.nextFloat() < 0.4;
    }
 
@@ -95,7 +95,7 @@
     * Mapping not found
     */
    @Override
-   public void grow(ServerWorld world, RandomGenerator random, BlockPos pos, BlockState state) {
+   public void fertilize(ServerWorld world, RandomGenerator random, BlockPos pos, BlockState state) {
       this.getFeatureHolder(world)
          .ifPresent(featureHolder -> ((ConfiguredFeature)featureHolder.value()).generate(world, world.getChunkManager().getChunkGenerator(), random, pos));
    }
diff -bur namedTargetSrc/net/minecraft/block/GlowLichenBlock.java namedSrc/net/minecraft/block/GlowLichenBlock.java
--- namedTargetSrc/net/minecraft/block/GlowLichenBlock.java	2023-06-17 19:46:16.691811083 +0000
+++ namedSrc/net/minecraft/block/GlowLichenBlock.java	2023-06-17 19:44:25.830216944 +0000
@@ -100,7 +100,7 @@
     * Mapping not found
     */
    @Override
-   public boolean canGrow(World world, RandomGenerator random, BlockPos pos, BlockState state) {
+   public boolean canFertilize(World world, RandomGenerator random, BlockPos pos, BlockState state) {
       return true;
    }
 
@@ -108,7 +108,7 @@
     * Mapping not found
     */
    @Override
-   public void grow(ServerWorld world, RandomGenerator random, BlockPos pos, BlockState state) {
+   public void fertilize(ServerWorld world, RandomGenerator random, BlockPos pos, BlockState state) {
       this.spreadBehavior.spreadFromRandomFacingToRandomDirection(state, world, pos, random);
    }
 
diff -bur namedTargetSrc/net/minecraft/block/GrassBlock.java namedSrc/net/minecraft/block/GrassBlock.java
--- namedTargetSrc/net/minecraft/block/GrassBlock.java	2023-06-17 19:46:16.755814254 +0000
+++ namedSrc/net/minecraft/block/GrassBlock.java	2023-06-17 19:44:25.910221346 +0000
@@ -38,7 +38,7 @@
     * Mapping not found
     */
    @Override
-   public boolean canGrow(World world, RandomGenerator random, BlockPos pos, BlockState state) {
+   public boolean canFertilize(World world, RandomGenerator random, BlockPos pos, BlockState state) {
       return true;
    }
 
@@ -46,7 +46,7 @@
     * Mapping not found
     */
    @Override
-   public void grow(ServerWorld world, RandomGenerator random, BlockPos pos, BlockState state) {
+   public void fertilize(ServerWorld world, RandomGenerator random, BlockPos pos, BlockState state) {
       BlockPos lv = pos.up();
       BlockState lv2 = Blocks.GRASS.getDefaultState();
       Optional<Holder.Reference<PlacedFeature>> optional = world.getRegistryManager()
@@ -66,7 +66,7 @@
 
          BlockState lv4 = world.getBlockState(lv3);
          if (lv4.isOf(lv2.getBlock()) && random.nextInt(10) == 0) {
-            ((Fertilizable)lv2.getBlock()).grow(world, random, lv3, lv4);
+            ((Fertilizable)lv2.getBlock()).fertilize(world, random, lv3, lv4);
          }
 
          if (lv4.isAir()) {
diff -bur namedTargetSrc/net/minecraft/block/MangroveLeavesBlock.java namedSrc/net/minecraft/block/MangroveLeavesBlock.java
--- namedTargetSrc/net/minecraft/block/MangroveLeavesBlock.java	2023-06-17 19:46:16.783815641 +0000
+++ namedSrc/net/minecraft/block/MangroveLeavesBlock.java	2023-06-17 19:44:25.946223327 +0000
@@ -30,7 +30,7 @@
     * Mapping not found
     */
    @Override
-   public boolean canGrow(World world, RandomGenerator random, BlockPos pos, BlockState state) {
+   public boolean canFertilize(World world, RandomGenerator random, BlockPos pos, BlockState state) {
       return true;
    }
 
@@ -38,7 +38,7 @@
     * Mapping not found
     */
    @Override
-   public void grow(ServerWorld world, RandomGenerator random, BlockPos pos, BlockState state) {
+   public void fertilize(ServerWorld world, RandomGenerator random, BlockPos pos, BlockState state) {
       world.setBlockState(pos.down(), MangrovePropaguleBlock.getHangingState(), Block.NOTIFY_LISTENERS);
    }
 }
diff -bur namedTargetSrc/net/minecraft/block/MangrovePropaguleBlock.java namedSrc/net/minecraft/block/MangrovePropaguleBlock.java
--- namedTargetSrc/net/minecraft/block/MangrovePropaguleBlock.java	2023-06-17 19:46:16.623807715 +0000
+++ namedSrc/net/minecraft/block/MangrovePropaguleBlock.java	2023-06-17 19:44:25.750212542 +0000
@@ -180,19 +180,19 @@
     * Mapping not found
     */
    @Override
-   public boolean canGrow(World world, RandomGenerator random, BlockPos pos, BlockState state) {
-      return isHanging(state) ? !isFullyGrown(state) : super.canGrow(world, random, pos, state);
+   public boolean canFertilize(World world, RandomGenerator random, BlockPos pos, BlockState state) {
+      return isHanging(state) ? !isFullyGrown(state) : super.canFertilize(world, random, pos, state);
    }
 
    /**
     * Mapping not found
     */
    @Override
-   public void grow(ServerWorld world, RandomGenerator random, BlockPos pos, BlockState state) {
+   public void fertilize(ServerWorld world, RandomGenerator random, BlockPos pos, BlockState state) {
       if (isHanging(state) && !isFullyGrown(state)) {
          world.setBlockState(pos, state.cycle(AGE_4), Block.NOTIFY_LISTENERS);
       } else {
-         super.grow(world, random, pos, state);
+         super.fertilize(world, random, pos, state);
       }
    }
 
diff -bur namedTargetSrc/net/minecraft/block/MossBlock.java namedSrc/net/minecraft/block/MossBlock.java
--- namedTargetSrc/net/minecraft/block/MossBlock.java	2023-06-17 19:46:16.731813065 +0000
+++ namedSrc/net/minecraft/block/MossBlock.java	2023-06-17 19:44:25.878219585 +0000
@@ -33,7 +33,7 @@
     * Mapping not found
     */
    @Override
-   public boolean canGrow(World world, RandomGenerator random, BlockPos pos, BlockState state) {
+   public boolean canFertilize(World world, RandomGenerator random, BlockPos pos, BlockState state) {
       return true;
    }
 
@@ -41,7 +41,7 @@
     * Mapping not found
     */
    @Override
-   public void grow(ServerWorld world, RandomGenerator random, BlockPos pos, BlockState state) {
+   public void fertilize(ServerWorld world, RandomGenerator random, BlockPos pos, BlockState state) {
       world.getRegistryManager()
          .getOptional(RegistryKeys.CONFIGURED_FEATURE)
          .flatMap(registry -> registry.getHolder(UndergroundConfiguredFeatures.MOSS_PATCH_BONE_MEAL))
diff -bur namedTargetSrc/net/minecraft/block/MushroomPlantBlock.java namedSrc/net/minecraft/block/MushroomPlantBlock.java
--- namedTargetSrc/net/minecraft/block/MushroomPlantBlock.java	2023-06-17 19:46:16.683810687 +0000
+++ namedSrc/net/minecraft/block/MushroomPlantBlock.java	2023-06-17 19:44:25.818216284 +0000
@@ -140,7 +140,7 @@
     * Mapping not found
     */
    @Override
-   public boolean canGrow(World world, RandomGenerator random, BlockPos pos, BlockState state) {
+   public boolean canFertilize(World world, RandomGenerator random, BlockPos pos, BlockState state) {
       return (double)random.nextFloat() < 0.4;
    }
 
@@ -148,7 +148,7 @@
     * Mapping not found
     */
    @Override
-   public void grow(ServerWorld world, RandomGenerator random, BlockPos pos, BlockState state) {
+   public void fertilize(ServerWorld world, RandomGenerator random, BlockPos pos, BlockState state) {
       this.trySpawningBigMushroom(world, pos, state, random);
    }
 }
diff -bur namedTargetSrc/net/minecraft/block/NetherrackBlock.java namedSrc/net/minecraft/block/NetherrackBlock.java
--- namedTargetSrc/net/minecraft/block/NetherrackBlock.java	2023-06-17 19:46:16.639808507 +0000
+++ namedSrc/net/minecraft/block/NetherrackBlock.java	2023-06-17 19:44:25.762213202 +0000
@@ -41,7 +41,7 @@
     * Mapping not found
     */
    @Override
-   public boolean canGrow(World world, RandomGenerator random, BlockPos pos, BlockState state) {
+   public boolean canFertilize(World world, RandomGenerator random, BlockPos pos, BlockState state) {
       return true;
    }
 
@@ -49,7 +49,7 @@
     * Mapping not found
     */
    @Override
-   public void grow(ServerWorld world, RandomGenerator random, BlockPos pos, BlockState state) {
+   public void fertilize(ServerWorld world, RandomGenerator random, BlockPos pos, BlockState state) {
       boolean bl = false;
       boolean bl2 = false;
 
diff -bur namedTargetSrc/net/minecraft/block/NyliumBlock.java namedSrc/net/minecraft/block/NyliumBlock.java
--- namedTargetSrc/net/minecraft/block/NyliumBlock.java	2023-06-17 19:46:16.635808309 +0000
+++ namedSrc/net/minecraft/block/NyliumBlock.java	2023-06-17 19:44:25.758212982 +0000
@@ -59,7 +59,7 @@
     * Mapping not found
     */
    @Override
-   public boolean canGrow(World world, RandomGenerator random, BlockPos pos, BlockState state) {
+   public boolean canFertilize(World world, RandomGenerator random, BlockPos pos, BlockState state) {
       return true;
    }
 
@@ -67,7 +67,7 @@
     * Mapping not found
     */
    @Override
-   public void grow(ServerWorld world, RandomGenerator random, BlockPos pos, BlockState state) {
+   public void fertilize(ServerWorld world, RandomGenerator random, BlockPos pos, BlockState state) {
       BlockState lv = world.getBlockState(pos);
       BlockPos lv2 = pos.up();
       ChunkGenerator lv3 = world.getChunkManager().getChunkGenerator();
diff -bur namedTargetSrc/net/minecraft/block/PinkPetalsBlock.java namedSrc/net/minecraft/block/PinkPetalsBlock.java
--- namedTargetSrc/net/minecraft/block/PinkPetalsBlock.java	2023-06-17 19:46:16.663809696 +0000
+++ namedSrc/net/minecraft/block/PinkPetalsBlock.java	2023-06-17 19:44:25.790214743 +0000
@@ -114,7 +114,7 @@
     * Mapping not found
     */
    @Override
-   public boolean canGrow(World world, RandomGenerator random, BlockPos pos, BlockState state) {
+   public boolean canFertilize(World world, RandomGenerator random, BlockPos pos, BlockState state) {
       return true;
    }
 
@@ -122,7 +122,7 @@
     * Mapping not found
     */
    @Override
-   public void grow(ServerWorld world, RandomGenerator random, BlockPos pos, BlockState state) {
+   public void fertilize(ServerWorld world, RandomGenerator random, BlockPos pos, BlockState state) {
       int i = state.get(AMOUNT);
       if (i < 4) {
          world.setBlockState(pos, state.with(AMOUNT, Integer.valueOf(i + 1)), Block.NOTIFY_LISTENERS);
diff -bur namedTargetSrc/net/minecraft/block/PitcherCropBlock.java namedSrc/net/minecraft/block/PitcherCropBlock.java
--- namedTargetSrc/net/minecraft/block/PitcherCropBlock.java	2023-06-17 19:46:16.743813659 +0000
+++ namedSrc/net/minecraft/block/PitcherCropBlock.java	2023-06-17 19:44:25.898220686 +0000
@@ -146,8 +146,8 @@
          return super.canPlaceAt(state, world, pos);
       } else {
          return this.canPlantOnTop(world.getBlockState(pos.down()), world, pos.down())
-            && m_ocvvosbx(world, pos)
-            && (state.get(AGE) < 3 || m_duxcbgiw(world.getBlockState(pos.up())));
+            && hasEnoughLight(world, pos)
+            && (state.get(AGE) < 3 || isUpperHalf(world.getBlockState(pos.up())));
       }
    }
 
@@ -223,7 +223,7 @@
     */
    private void grow(ServerWorld world, BlockState state, BlockPos pos, int amount) {
       int j = Math.min(state.get(AGE) + amount, 4);
-      if (this.m_ojkbyeir(world, pos, state, j)) {
+      if (this.canGrow(world, pos, state, j)) {
          world.setBlockState(pos, state.with(AGE, Integer.valueOf(j)), Block.NOTIFY_LISTENERS);
          if (j >= 3) {
             BlockPos lv = pos.up();
@@ -245,9 +245,9 @@
 
    /**
     * @mapping {@literal hashed m_ocvvosbx Lnet/minecraft/unmapped/C_fntbpikr;m_ocvvosbx(Lnet/minecraft/unmapped/C_eemzphbi;Lnet/minecraft/unmapped/C_hynzadkk;)Z}
-    * @mapping {@literal named m_ocvvosbx Lnet/minecraft/block/PitcherCropBlock;m_ocvvosbx(Lnet/minecraft/world/WorldView;Lnet/minecraft/util/math/BlockPos;)Z}
+    * @mapping {@literal named hasEnoughLight Lnet/minecraft/block/PitcherCropBlock;hasEnoughLight(Lnet/minecraft/world/WorldView;Lnet/minecraft/util/math/BlockPos;)Z}
     */
-   private static boolean m_ocvvosbx(WorldView world, BlockPos pos) {
+   private static boolean hasEnoughLight(WorldView world, BlockPos pos) {
       return world.getBaseLightLevel(pos, 0) >= 8 || world.isSkyVisible(pos);
    }
 
@@ -261,32 +261,32 @@
 
    /**
     * @mapping {@literal hashed m_duxcbgiw Lnet/minecraft/unmapped/C_fntbpikr;m_duxcbgiw(Lnet/minecraft/unmapped/C_txtbiemp;)Z}
-    * @mapping {@literal named m_duxcbgiw Lnet/minecraft/block/PitcherCropBlock;m_duxcbgiw(Lnet/minecraft/block/BlockState;)Z}
+    * @mapping {@literal named isUpperHalf Lnet/minecraft/block/PitcherCropBlock;isUpperHalf(Lnet/minecraft/block/BlockState;)Z}
     */
-   private static boolean m_duxcbgiw(BlockState state) {
+   private static boolean isUpperHalf(BlockState state) {
       return state.isOf(Blocks.PITCHER_CROP) && state.get(HALF) == DoubleBlockHalf.UPPER;
    }
 
    /**
     * @mapping {@literal hashed m_ojkbyeir Lnet/minecraft/unmapped/C_fntbpikr;m_ojkbyeir(Lnet/minecraft/unmapped/C_eemzphbi;Lnet/minecraft/unmapped/C_hynzadkk;Lnet/minecraft/unmapped/C_txtbiemp;I)Z}
-    * @mapping {@literal named m_ojkbyeir Lnet/minecraft/block/PitcherCropBlock;m_ojkbyeir(Lnet/minecraft/world/WorldView;Lnet/minecraft/util/math/BlockPos;Lnet/minecraft/block/BlockState;I)Z}
+    * @mapping {@literal named canGrow Lnet/minecraft/block/PitcherCropBlock;canGrow(Lnet/minecraft/world/WorldView;Lnet/minecraft/util/math/BlockPos;Lnet/minecraft/block/BlockState;I)Z}
     */
-   private boolean m_ojkbyeir(WorldView world, BlockPos pos, BlockState state, int i) {
-      return !this.isMaxAge(state) && m_ocvvosbx(world, pos) && (i < 3 || canGrowInto(world, pos.up()));
+   private boolean canGrow(WorldView world, BlockPos pos, BlockState state, int age) {
+      return !this.isMaxAge(state) && hasEnoughLight(world, pos) && (age < 3 || canGrowInto(world, pos.up()));
    }
 
    /**
     * @mapping {@literal hashed m_vhxaczet Lnet/minecraft/unmapped/C_fntbpikr;m_vhxaczet(Lnet/minecraft/unmapped/C_eemzphbi;Lnet/minecraft/unmapped/C_hynzadkk;Lnet/minecraft/unmapped/C_txtbiemp;)Lnet/minecraft/unmapped/C_fntbpikr$C_jrcoboha;}
-    * @mapping {@literal named m_vhxaczet Lnet/minecraft/block/PitcherCropBlock;m_vhxaczet(Lnet/minecraft/world/WorldView;Lnet/minecraft/util/math/BlockPos;Lnet/minecraft/block/BlockState;)Lnet/minecraft/block/PitcherCropBlock$C_jrcoboha;}
+    * @mapping {@literal named getLowerHalf Lnet/minecraft/block/PitcherCropBlock;getLowerHalf(Lnet/minecraft/world/WorldView;Lnet/minecraft/util/math/BlockPos;Lnet/minecraft/block/BlockState;)Lnet/minecraft/block/PitcherCropBlock$LowerHalfInfo;}
     */
    @Nullable
-   private PitcherCropBlock.C_jrcoboha m_vhxaczet(WorldView world, BlockPos pos, BlockState state) {
+   private PitcherCropBlock.LowerHalfInfo getLowerHalf(WorldView world, BlockPos pos, BlockState state) {
       if (isLowerHalf(state)) {
-         return new PitcherCropBlock.C_jrcoboha(pos, state);
+         return new PitcherCropBlock.LowerHalfInfo(pos, state);
       } else {
          BlockPos lv = pos.down();
          BlockState lv2 = world.getBlockState(lv);
-         return isLowerHalf(lv2) ? new PitcherCropBlock.C_jrcoboha(lv, lv2) : null;
+         return isLowerHalf(lv2) ? new PitcherCropBlock.LowerHalfInfo(lv, lv2) : null;
       }
    }
 
@@ -295,15 +295,15 @@
     */
    @Override
    public boolean isFertilizable(WorldView world, BlockPos pos, BlockState state, boolean isClient) {
-      PitcherCropBlock.C_jrcoboha lv = this.m_vhxaczet(world, pos, state);
-      return lv == null ? false : this.m_ojkbyeir(world, lv.pos, lv.state, lv.state.get(AGE) + 1);
+      PitcherCropBlock.LowerHalfInfo lv = this.getLowerHalf(world, pos, state);
+      return lv == null ? false : this.canGrow(world, lv.pos, lv.state, lv.state.get(AGE) + 1);
    }
 
    /**
     * Mapping not found
     */
    @Override
-   public boolean canGrow(World world, RandomGenerator random, BlockPos pos, BlockState state) {
+   public boolean canFertilize(World world, RandomGenerator random, BlockPos pos, BlockState state) {
       return true;
    }
 
@@ -311,8 +311,8 @@
     * Mapping not found
     */
    @Override
-   public void grow(ServerWorld world, RandomGenerator random, BlockPos pos, BlockState state) {
-      PitcherCropBlock.C_jrcoboha lv = this.m_vhxaczet(world, pos, state);
+   public void fertilize(ServerWorld world, RandomGenerator random, BlockPos pos, BlockState state) {
+      PitcherCropBlock.LowerHalfInfo lv = this.getLowerHalf(world, pos, state);
       if (lv != null) {
          this.grow(world, lv.state, lv.pos, 1);
       }
@@ -320,8 +320,8 @@
 
    /**
     * @mapping {@literal hashed net/minecraft/unmapped/C_fntbpikr$C_jrcoboha}
-    * @mapping {@literal named net/minecraft/block/PitcherCropBlock$C_jrcoboha}
+    * @mapping {@literal named net/minecraft/block/PitcherCropBlock$LowerHalfInfo}
     */
-   static record C_jrcoboha(BlockPos pos, BlockState state) {
+   static record LowerHalfInfo(BlockPos pos, BlockState state) {
    }
 }
diff -bur namedTargetSrc/net/minecraft/block/RootedDirtBlock.java namedSrc/net/minecraft/block/RootedDirtBlock.java
--- namedTargetSrc/net/minecraft/block/RootedDirtBlock.java	2023-06-17 19:46:16.719812470 +0000
+++ namedSrc/net/minecraft/block/RootedDirtBlock.java	2023-06-17 19:44:25.866218925 +0000
@@ -30,7 +30,7 @@
     * Mapping not found
     */
    @Override
-   public boolean canGrow(World world, RandomGenerator random, BlockPos pos, BlockState state) {
+   public boolean canFertilize(World world, RandomGenerator random, BlockPos pos, BlockState state) {
       return true;
    }
 
@@ -38,7 +38,7 @@
     * Mapping not found
     */
    @Override
-   public void grow(ServerWorld world, RandomGenerator random, BlockPos pos, BlockState state) {
+   public void fertilize(ServerWorld world, RandomGenerator random, BlockPos pos, BlockState state) {
       world.setBlockState(pos.down(), Blocks.HANGING_ROOTS.getDefaultState());
    }
 }
diff -bur namedTargetSrc/net/minecraft/block/SaplingBlock.java namedSrc/net/minecraft/block/SaplingBlock.java
--- namedTargetSrc/net/minecraft/block/SaplingBlock.java	2023-06-17 19:46:16.655809300 +0000
+++ namedSrc/net/minecraft/block/SaplingBlock.java	2023-06-17 19:44:25.782214303 +0000
@@ -90,7 +90,7 @@
     * Mapping not found
     */
    @Override
-   public boolean canGrow(World world, RandomGenerator random, BlockPos pos, BlockState state) {
+   public boolean canFertilize(World world, RandomGenerator random, BlockPos pos, BlockState state) {
       return (double)world.random.nextFloat() < 0.45;
    }
 
@@ -98,7 +98,7 @@
     * Mapping not found
     */
    @Override
-   public void grow(ServerWorld world, RandomGenerator random, BlockPos pos, BlockState state) {
+   public void fertilize(ServerWorld world, RandomGenerator random, BlockPos pos, BlockState state) {
       this.generate(world, pos, state, random);
    }
 
diff -bur namedTargetSrc/net/minecraft/block/SeagrassBlock.java namedSrc/net/minecraft/block/SeagrassBlock.java
--- namedTargetSrc/net/minecraft/block/SeagrassBlock.java	2023-06-17 19:46:16.663809696 +0000
+++ namedSrc/net/minecraft/block/SeagrassBlock.java	2023-06-17 19:44:25.794214963 +0000
@@ -93,7 +93,7 @@
     * Mapping not found
     */
    @Override
-   public boolean canGrow(World world, RandomGenerator random, BlockPos pos, BlockState state) {
+   public boolean canFertilize(World world, RandomGenerator random, BlockPos pos, BlockState state) {
       return true;
    }
 
@@ -109,7 +109,7 @@
     * Mapping not found
     */
    @Override
-   public void grow(ServerWorld world, RandomGenerator random, BlockPos pos, BlockState state) {
+   public void fertilize(ServerWorld world, RandomGenerator random, BlockPos pos, BlockState state) {
       BlockState lv = Blocks.TALL_SEAGRASS.getDefaultState();
       BlockState lv2 = lv.with(TallSeagrassBlock.SEAGRASS_HALF, DoubleBlockHalf.UPPER);
       BlockPos lv3 = pos.up();
diff -bur namedTargetSrc/net/minecraft/block/SeaPickleBlock.java namedSrc/net/minecraft/block/SeaPickleBlock.java
--- namedTargetSrc/net/minecraft/block/SeaPickleBlock.java	2023-06-17 19:46:16.667809894 +0000
+++ namedSrc/net/minecraft/block/SeaPickleBlock.java	2023-06-17 19:44:25.798215183 +0000
@@ -182,7 +182,7 @@
     * Mapping not found
     */
    @Override
-   public boolean canGrow(World world, RandomGenerator random, BlockPos pos, BlockState state) {
+   public boolean canFertilize(World world, RandomGenerator random, BlockPos pos, BlockState state) {
       return true;
    }
 
@@ -190,7 +190,7 @@
     * Mapping not found
     */
    @Override
-   public void grow(ServerWorld world, RandomGenerator random, BlockPos pos, BlockState state) {
+   public void fertilize(ServerWorld world, RandomGenerator random, BlockPos pos, BlockState state) {
       if (!isDry(state) && world.getBlockState(pos.down()).isIn(BlockTags.CORAL_BLOCKS)) {
          int i = 5;
          int j = 1;
diff -bur namedTargetSrc/net/minecraft/block/SmallDripleafBlock.java namedSrc/net/minecraft/block/SmallDripleafBlock.java
--- namedTargetSrc/net/minecraft/block/SmallDripleafBlock.java	2023-06-17 19:46:16.735813263 +0000
+++ namedSrc/net/minecraft/block/SmallDripleafBlock.java	2023-06-17 19:44:25.882219805 +0000
@@ -157,7 +157,7 @@
     * Mapping not found
     */
    @Override
-   public boolean canGrow(World world, RandomGenerator random, BlockPos pos, BlockState state) {
+   public boolean canFertilize(World world, RandomGenerator random, BlockPos pos, BlockState state) {
       return true;
    }
 
@@ -165,14 +165,14 @@
     * Mapping not found
     */
    @Override
-   public void grow(ServerWorld world, RandomGenerator random, BlockPos pos, BlockState state) {
+   public void fertilize(ServerWorld world, RandomGenerator random, BlockPos pos, BlockState state) {
       if (state.get(TallPlantBlock.HALF) == DoubleBlockHalf.LOWER) {
          BlockPos lv = pos.up();
          world.setBlockState(lv, world.getFluidState(lv).getBlockState(), Block.NOTIFY_LISTENERS | Block.FORCE_STATE);
          BigDripleafBlock.grow(world, random, pos, state.get(FACING));
       } else {
          BlockPos lv2 = pos.down();
-         this.grow(world, random, lv2, world.getBlockState(lv2));
+         this.fertilize(world, random, lv2, world.getBlockState(lv2));
       }
    }
 
diff -bur namedTargetSrc/net/minecraft/block/StemBlock.java namedSrc/net/minecraft/block/StemBlock.java
--- namedTargetSrc/net/minecraft/block/StemBlock.java	2023-06-17 19:46:16.727812866 +0000
+++ namedSrc/net/minecraft/block/StemBlock.java	2023-06-17 19:44:25.878219585 +0000
@@ -135,7 +135,7 @@
     * Mapping not found
     */
    @Override
-   public boolean canGrow(World world, RandomGenerator random, BlockPos pos, BlockState state) {
+   public boolean canFertilize(World world, RandomGenerator random, BlockPos pos, BlockState state) {
       return true;
    }
 
@@ -143,7 +143,7 @@
     * Mapping not found
     */
    @Override
-   public void grow(ServerWorld world, RandomGenerator random, BlockPos pos, BlockState state) {
+   public void fertilize(ServerWorld world, RandomGenerator random, BlockPos pos, BlockState state) {
       int i = Math.min(7, state.get(AGE) + MathHelper.nextInt(world.random, 2, 5));
       BlockState lv = state.with(AGE, Integer.valueOf(i));
       world.setBlockState(pos, lv, Block.NOTIFY_LISTENERS);
diff -bur namedTargetSrc/net/minecraft/block/SweetBerryBushBlock.java namedSrc/net/minecraft/block/SweetBerryBushBlock.java
--- namedTargetSrc/net/minecraft/block/SweetBerryBushBlock.java	2023-06-17 19:46:16.771815046 +0000
+++ namedSrc/net/minecraft/block/SweetBerryBushBlock.java	2023-06-17 19:44:25.930222446 +0000
@@ -163,7 +163,7 @@
     * Mapping not found
     */
    @Override
-   public boolean canGrow(World world, RandomGenerator random, BlockPos pos, BlockState state) {
+   public boolean canFertilize(World world, RandomGenerator random, BlockPos pos, BlockState state) {
       return true;
    }
 
@@ -171,7 +171,7 @@
     * Mapping not found
     */
    @Override
-   public void grow(ServerWorld world, RandomGenerator random, BlockPos pos, BlockState state) {
+   public void fertilize(ServerWorld world, RandomGenerator random, BlockPos pos, BlockState state) {
       int i = Math.min(3, state.get(AGE) + 1);
       world.setBlockState(pos, state.with(AGE, Integer.valueOf(i)), Block.NOTIFY_LISTENERS);
    }
diff -bur namedTargetSrc/net/minecraft/block/TallFlowerBlock.java namedSrc/net/minecraft/block/TallFlowerBlock.java
--- namedTargetSrc/net/minecraft/block/TallFlowerBlock.java	2023-06-17 19:46:16.703811678 +0000
+++ namedSrc/net/minecraft/block/TallFlowerBlock.java	2023-06-17 19:44:25.842217604 +0000
@@ -31,7 +31,7 @@
     * Mapping not found
     */
    @Override
-   public boolean canGrow(World world, RandomGenerator random, BlockPos pos, BlockState state) {
+   public boolean canFertilize(World world, RandomGenerator random, BlockPos pos, BlockState state) {
       return true;
    }
 
@@ -39,7 +39,7 @@
     * Mapping not found
     */
    @Override
-   public void grow(ServerWorld world, RandomGenerator random, BlockPos pos, BlockState state) {
+   public void fertilize(ServerWorld world, RandomGenerator random, BlockPos pos, BlockState state) {
       dropStack(world, pos, new ItemStack(this));
    }
 }
diff -bur namedTargetSrc/net/minecraft/client/gui/hud/InGameHud.java namedSrc/net/minecraft/client/gui/hud/InGameHud.java
--- namedTargetSrc/net/minecraft/client/gui/hud/InGameHud.java	2023-06-17 19:46:16.671810092 +0000
+++ namedSrc/net/minecraft/client/gui/hud/InGameHud.java	2023-06-17 19:44:25.802215403 +0000
@@ -385,7 +385,7 @@
          this.renderOverlay(graphics, POWDER_SNOW_OUTLINE, this.client.player.getFreezingScale());
       }
 
-      float h = MathHelper.lerp(tickDelta, this.client.player.f_ztnegqze, this.client.player.f_jfhotzll);
+      float h = MathHelper.lerp(tickDelta, this.client.player.lastScreenSwirlIntensity, this.client.player.screenSwirlIntensity);
       if (h > 0.0F && !this.client.player.hasStatusEffect(StatusEffects.NAUSEA)) {
          this.renderPortalOverlay(graphics, h);
       }
diff -bur namedTargetSrc/net/minecraft/client/gui/screen/AccessibilityOnboardingScreen.java namedSrc/net/minecraft/client/gui/screen/AccessibilityOnboardingScreen.java
--- namedTargetSrc/net/minecraft/client/gui/screen/AccessibilityOnboardingScreen.java	2023-06-17 19:46:16.707811876 +0000
+++ namedSrc/net/minecraft/client/gui/screen/AccessibilityOnboardingScreen.java	2023-06-17 19:44:25.850218045 +0000
@@ -103,7 +103,7 @@
       lv3.getDefaultElementSettings().setPadding(2);
       this.textWidget = new AccessibilityOnboardingTextWidget(this.textRenderer, this.title, this.width);
       lv3.add(this.textWidget, lv3.copyDefaultSettings().setBottomPadding(16));
-      ClickableWidget lv4 = this.options.getNarrator().m_ffpjahoa(this.options, 0, 0, 150);
+      ClickableWidget lv4 = this.options.getNarrator().createButton(this.options, 0, 0, 150);
       lv4.active = this.narratorAvailable;
       lv3.add(lv4);
       if (this.narratorAvailable) {
diff -bur namedTargetSrc/net/minecraft/client/gui/screen/option/ControlsOptionsScreen.java namedSrc/net/minecraft/client/gui/screen/option/ControlsOptionsScreen.java
--- namedTargetSrc/net/minecraft/client/gui/screen/option/ControlsOptionsScreen.java	2023-06-17 19:46:16.675810290 +0000
+++ namedSrc/net/minecraft/client/gui/screen/option/ControlsOptionsScreen.java	2023-06-17 19:44:25.806215624 +0000
@@ -49,11 +49,11 @@
             .build()
       );
       k += 24;
-      this.addDrawableChild(this.gameOptions.getToggleableSneak().m_ffpjahoa(this.gameOptions, i, k, 150));
-      this.addDrawableChild(this.gameOptions.getToggleableSprint().m_ffpjahoa(this.gameOptions, j, k, 150));
+      this.addDrawableChild(this.gameOptions.getToggleableSneak().createButton(this.gameOptions, i, k, 150));
+      this.addDrawableChild(this.gameOptions.getToggleableSprint().createButton(this.gameOptions, j, k, 150));
       k += 24;
-      this.addDrawableChild(this.gameOptions.getAutoJump().m_ffpjahoa(this.gameOptions, i, k, 150));
-      this.addDrawableChild(this.gameOptions.getOperatorItemsTab().m_ffpjahoa(this.gameOptions, j, k, 150));
+      this.addDrawableChild(this.gameOptions.getAutoJump().createButton(this.gameOptions, i, k, 150));
+      this.addDrawableChild(this.gameOptions.getOperatorItemsTab().createButton(this.gameOptions, j, k, 150));
       k += 24;
       this.addDrawableChild(
          ButtonWidget.builder(CommonTexts.DONE, button -> this.client.setScreen(this.parent)).positionAndSize(this.width / 2 - 100, k, 200, 20).build()
diff -bur namedTargetSrc/net/minecraft/client/gui/screen/option/LanguageOptionsScreen.java namedSrc/net/minecraft/client/gui/screen/option/LanguageOptionsScreen.java
--- namedTargetSrc/net/minecraft/client/gui/screen/option/LanguageOptionsScreen.java	2023-06-17 19:46:16.655809300 +0000
+++ namedSrc/net/minecraft/client/gui/screen/option/LanguageOptionsScreen.java	2023-06-17 19:44:25.786214523 +0000
@@ -57,7 +57,7 @@
    protected void init() {
       this.languageSelectionList = new LanguageOptionsScreen.LanguageSelectionListWidget(this.client);
       this.addSelectableChild(this.languageSelectionList);
-      this.addDrawableChild(this.gameOptions.getForceUnicodeFont().m_ffpjahoa(this.gameOptions, this.width / 2 - 155, this.height - 38, 150));
+      this.addDrawableChild(this.gameOptions.getForceUnicodeFont().createButton(this.gameOptions, this.width / 2 - 155, this.height - 38, 150));
       this.addDrawableChild(
          ButtonWidget.builder(CommonTexts.DONE, button -> this.onDone()).positionAndSize(this.width / 2 - 155 + 160, this.height - 38, 150, 20).build()
       );
diff -bur namedTargetSrc/net/minecraft/client/gui/screen/option/OptionsScreen.java namedSrc/net/minecraft/client/gui/screen/option/OptionsScreen.java
--- namedTargetSrc/net/minecraft/client/gui/screen/option/OptionsScreen.java	2023-06-17 19:46:16.639808507 +0000
+++ namedSrc/net/minecraft/client/gui/screen/option/OptionsScreen.java	2023-06-17 19:44:25.766213423 +0000
@@ -126,7 +126,7 @@
       GridWidget lv = new GridWidget();
       lv.getDefaultSettings().setHorizontalPadding(5).setBottomPadding(4).alignHorizontallyCenter();
       GridWidget.AdditionHelper lv2 = lv.createAdditionHelper(2);
-      lv2.add(this.settings.getFov().m_ffpjahoa(this.client.options, 0, 0, 150));
+      lv2.add(this.settings.getFov().createButton(this.client.options, 0, 0, 150));
       lv2.add(this.createOnlineButton());
       lv2.add(SpacerWidget.withHeight(26), 2);
       lv2.add(this.createButton(SKIN_CUSTOMIZATION_TEXT, () -> new SkinOptionsScreen(this, this.settings)));
diff -bur namedTargetSrc/net/minecraft/client/gui/screen/option/SkinOptionsScreen.java namedSrc/net/minecraft/client/gui/screen/option/SkinOptionsScreen.java
--- namedTargetSrc/net/minecraft/client/gui/screen/option/SkinOptionsScreen.java	2023-06-17 19:46:16.667809894 +0000
+++ namedSrc/net/minecraft/client/gui/screen/option/SkinOptionsScreen.java	2023-06-17 19:44:25.798215183 +0000
@@ -48,7 +48,7 @@
       }
 
       this.addDrawableChild(
-         this.gameOptions.getMainArm().m_ffpjahoa(this.gameOptions, this.width / 2 - 155 + i % 2 * 160, this.height / 6 + 24 * (i >> 1), 150)
+         this.gameOptions.getMainArm().createButton(this.gameOptions, this.width / 2 - 155 + i % 2 * 160, this.height / 6 + 24 * (i >> 1), 150)
       );
       if (++i % 2 == 1) {
          ++i;
diff -bur namedTargetSrc/net/minecraft/client/gui/screen/recipe/book/RecipeAlternativesWidget.java namedSrc/net/minecraft/client/gui/screen/recipe/book/RecipeAlternativesWidget.java
--- namedTargetSrc/net/minecraft/client/gui/screen/recipe/book/RecipeAlternativesWidget.java	2023-06-17 19:46:16.679810489 +0000
+++ namedSrc/net/minecraft/client/gui/screen/recipe/book/RecipeAlternativesWidget.java	2023-06-17 19:44:25.814216064 +0000
@@ -202,7 +202,7 @@
     * Mapping not found
     */
    @Override
-   public boolean isMouseOver(double mouseX, double mouseY) {
+   public boolean isMouseOver(double d, double e) {
       return false;
    }
 
diff -bur namedTargetSrc/net/minecraft/client/gui/screen/recipe/book/RecipeBookWidget.java namedSrc/net/minecraft/client/gui/screen/recipe/book/RecipeBookWidget.java
--- namedTargetSrc/net/minecraft/client/gui/screen/recipe/book/RecipeBookWidget.java	2023-06-17 19:46:16.755814254 +0000
+++ namedSrc/net/minecraft/client/gui/screen/recipe/book/RecipeBookWidget.java	2023-06-17 19:44:25.910221346 +0000
@@ -616,7 +616,7 @@
     * Mapping not found
     */
    @Override
-   public boolean isMouseOver(double mouseX, double mouseY) {
+   public boolean isMouseOver(double d, double e) {
       return false;
    }
 
diff -bur namedTargetSrc/net/minecraft/client/gui/screen/Screen.java namedSrc/net/minecraft/client/gui/screen/Screen.java
--- namedTargetSrc/net/minecraft/client/gui/screen/Screen.java	2023-06-17 19:46:16.639808507 +0000
+++ namedSrc/net/minecraft/client/gui/screen/Screen.java	2023-06-17 19:44:25.766213423 +0000
@@ -727,7 +727,7 @@
     * Mapping not found
     */
    @Override
-   public boolean isMouseOver(double mouseX, double mouseY) {
+   public boolean isMouseOver(double d, double e) {
       return true;
    }
 
diff -bur namedTargetSrc/net/minecraft/client/gui/screen/TelemetryDataScreen.java namedSrc/net/minecraft/client/gui/screen/TelemetryDataScreen.java
--- namedTargetSrc/net/minecraft/client/gui/screen/TelemetryDataScreen.java	2023-06-17 19:46:16.651809102 +0000
+++ namedSrc/net/minecraft/client/gui/screen/TelemetryDataScreen.java	2023-06-17 19:44:25.778214083 +0000
@@ -123,7 +123,7 @@
     * @mapping {@literal named createOptionalTelemetryButton Lnet/minecraft/client/gui/screen/TelemetryDataScreen;createOptionalTelemetryButton()Lnet/minecraft/client/gui/widget/ClickableWidget;}
     */
    private ClickableWidget createOptionalTelemetryButton() {
-      ClickableWidget lv = this.options.getTelemetry().m_ayuyezwm(this.options, 0, 0, 150, arg -> this.eventWidget.update(arg));
+      ClickableWidget lv = this.options.getTelemetry().createButton(this.options, 0, 0, 150, arg -> this.eventWidget.update(arg));
       lv.active = this.client.isOptionalTelemetryAvailable();
       return lv;
    }
diff -bur namedTargetSrc/net/minecraft/client/gui/widget/ButtonListWidget.java namedSrc/net/minecraft/client/gui/widget/ButtonListWidget.java
--- namedTargetSrc/net/minecraft/client/gui/widget/ButtonListWidget.java	2023-06-17 19:46:16.739813461 +0000
+++ namedSrc/net/minecraft/client/gui/widget/ButtonListWidget.java	2023-06-17 19:44:25.890220246 +0000
@@ -134,7 +134,7 @@
        * @mapping {@literal named create Lnet/minecraft/client/gui/widget/ButtonListWidget$ButtonEntry;create(Lnet/minecraft/client/option/GameOptions;ILnet/minecraft/client/option/Option;)Lnet/minecraft/client/gui/widget/ButtonListWidget$ButtonEntry;}
        */
       public static ButtonListWidget.ButtonEntry create(GameOptions options, int width, Option<?> option) {
-         return new ButtonListWidget.ButtonEntry(ImmutableMap.of(option, option.m_ffpjahoa(options, width / 2 - 155, 0, 310)));
+         return new ButtonListWidget.ButtonEntry(ImmutableMap.of(option, option.createButton(options, width / 2 - 155, 0, 310)));
       }
 
       /**
@@ -142,10 +142,12 @@
        * @mapping {@literal named create Lnet/minecraft/client/gui/widget/ButtonListWidget$ButtonEntry;create(Lnet/minecraft/client/option/GameOptions;ILnet/minecraft/client/option/Option;Lnet/minecraft/client/option/Option;)Lnet/minecraft/client/gui/widget/ButtonListWidget$ButtonEntry;}
        */
       public static ButtonListWidget.ButtonEntry create(GameOptions options, int width, Option<?> firstOption, @Nullable Option<?> secondOption) {
-         ClickableWidget lv = firstOption.m_ffpjahoa(options, width / 2 - 155, 0, 150);
+         ClickableWidget lv = firstOption.createButton(options, width / 2 - 155, 0, 150);
          return secondOption == null
             ? new ButtonListWidget.ButtonEntry(ImmutableMap.of(firstOption, lv))
-            : new ButtonListWidget.ButtonEntry(ImmutableMap.of(firstOption, lv, secondOption, secondOption.m_ffpjahoa(options, width / 2 - 155 + 160, 0, 150)));
+            : new ButtonListWidget.ButtonEntry(
+               ImmutableMap.of(firstOption, lv, secondOption, secondOption.createButton(options, width / 2 - 155 + 160, 0, 150))
+            );
       }
 
       /**
diff -bur namedTargetSrc/net/minecraft/client/gui/widget/ClickableWidget.java namedSrc/net/minecraft/client/gui/widget/ClickableWidget.java
--- namedTargetSrc/net/minecraft/client/gui/widget/ClickableWidget.java	2023-06-17 19:46:16.751814055 +0000
+++ namedSrc/net/minecraft/client/gui/widget/ClickableWidget.java	2023-06-17 19:44:25.906221126 +0000
@@ -406,13 +406,13 @@
     * Mapping not found
     */
    @Override
-   public boolean isMouseOver(double mouseX, double mouseY) {
+   public boolean isMouseOver(double d, double e) {
       return this.active
          && this.visible
-         && mouseX >= (double)this.getX()
-         && mouseY >= (double)this.getY()
-         && mouseX < (double)(this.getX() + this.width)
-         && mouseY < (double)(this.getY() + this.height);
+         && d >= (double)this.getX()
+         && e >= (double)this.getY()
+         && d < (double)(this.getX() + this.width)
+         && e < (double)(this.getY() + this.height);
    }
 
    /**
diff -bur namedTargetSrc/net/minecraft/client/gui/widget/EntryListWidget.java namedSrc/net/minecraft/client/gui/widget/EntryListWidget.java
--- namedTargetSrc/net/minecraft/client/gui/widget/EntryListWidget.java	2023-06-17 19:46:16.627807913 +0000
+++ namedSrc/net/minecraft/client/gui/widget/EntryListWidget.java	2023-06-17 19:44:25.754212762 +0000
@@ -683,8 +683,8 @@
     * Mapping not found
     */
    @Override
-   public boolean isMouseOver(double mouseX, double mouseY) {
-      return mouseY >= (double)this.top && mouseY <= (double)this.bottom && mouseX >= (double)this.left && mouseX <= (double)this.right;
+   public boolean isMouseOver(double d, double e) {
+      return e >= (double)this.top && e <= (double)this.bottom && d >= (double)this.left && d <= (double)this.right;
    }
 
    /**
@@ -957,8 +957,8 @@
        * @mapping {@literal named isMouseOver Lnet/minecraft/client/gui/widget/EntryListWidget$Entry;isMouseOver(DD)Z}
        */
       @Override
-      public boolean isMouseOver(double mouseX, double mouseY) {
-         return Objects.equals(this.parentList.getEntryAtPosition(mouseX, mouseY), this);
+      public boolean isMouseOver(double d, double e) {
+         return Objects.equals(this.parentList.getEntryAtPosition(d, e), this);
       }
    }
 }
diff -bur namedTargetSrc/net/minecraft/client/gui/widget/TextFieldWidget.java namedSrc/net/minecraft/client/gui/widget/TextFieldWidget.java
--- namedTargetSrc/net/minecraft/client/gui/widget/TextFieldWidget.java	2023-06-17 19:46:16.639808507 +0000
+++ namedSrc/net/minecraft/client/gui/widget/TextFieldWidget.java	2023-06-17 19:44:25.766213423 +0000
@@ -749,12 +749,12 @@
     * Mapping not found
     */
    @Override
-   public boolean isMouseOver(double mouseX, double mouseY) {
+   public boolean isMouseOver(double d, double e) {
       return this.visible
-         && mouseX >= (double)this.getX()
-         && mouseX < (double)(this.getX() + this.width)
-         && mouseY >= (double)this.getY()
-         && mouseY < (double)(this.getY() + this.height);
+         && d >= (double)this.getX()
+         && d < (double)(this.getX() + this.width)
+         && e >= (double)this.getY()
+         && e < (double)(this.getY() + this.height);
    }
 
    /**
diff -bur namedTargetSrc/net/minecraft/client/MinecraftClient.java namedSrc/net/minecraft/client/MinecraftClient.java
--- namedTargetSrc/net/minecraft/client/MinecraftClient.java	2023-06-17 19:46:16.643808705 +0000
+++ namedSrc/net/minecraft/client/MinecraftClient.java	2023-06-17 19:44:25.770213643 +0000
@@ -1181,10 +1181,10 @@
                Util.getOperatingSystem().open("https://aka.ms/mcjavamoderation");
             }
 
-            this.connectQuickPlay(lv7, lv8, args.quickPlay);
+            this.setInitialScreen(lv7, lv8, args.quickPlay);
          }, this.getBanDetails()));
       } else {
-         this.connectQuickPlay(lv7, lv8, args.quickPlay);
+         this.setInitialScreen(lv7, lv8, args.quickPlay);
       }
    }
 
@@ -1199,9 +1199,9 @@
 
    /**
     * @mapping {@literal hashed m_qozcjtsz Lnet/minecraft/unmapped/C_ayfeobid;m_qozcjtsz(Lnet/minecraft/unmapped/C_ivysvyzf;Lnet/minecraft/unmapped/C_dzecaeok;Lnet/minecraft/unmapped/C_pdsiuywi$C_ztbvorvu;)V}
-    * @mapping {@literal named connectQuickPlay Lnet/minecraft/client/MinecraftClient;connectQuickPlay(Lnet/minecraft/client/realms/RealmsClient;Lnet/minecraft/resource/ResourceReload;Lnet/minecraft/client/RunArgs$QuickPlay;)V}
+    * @mapping {@literal named setInitialScreen Lnet/minecraft/client/MinecraftClient;setInitialScreen(Lnet/minecraft/client/realms/RealmsClient;Lnet/minecraft/resource/ResourceReload;Lnet/minecraft/client/RunArgs$QuickPlay;)V}
     */
-   private void connectQuickPlay(RealmsClient realmsClient, ResourceReload resourceReload, RunArgs.QuickPlay quickPlay) {
+   private void setInitialScreen(RealmsClient realmsClient, ResourceReload resourceReload, RunArgs.QuickPlay quickPlay) {
       if (quickPlay.isEnabled()) {
          QuickPlay.connect(this, quickPlay, resourceReload, realmsClient);
       } else if (this.options.onboardAccessibility) {
@@ -1721,7 +1721,7 @@
       BufferRenderer.unbindAll();
       if (screen != null) {
          this.mouse.unlockCursor();
-         KeyBind.unpressAll();
+         KeyBind.resetAll();
          screen.init(this, this.window.getScaledWidth(), this.window.getScaledHeight());
          this.skipGameRender = false;
       } else {

@github-actions
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

View the diff here (2/3): 
diff -bur namedTargetSrc/net/minecraft/client/network/ClientPlayerEntity.java namedSrc/net/minecraft/client/network/ClientPlayerEntity.java
--- namedTargetSrc/net/minecraft/client/network/ClientPlayerEntity.java	2023-06-17 19:46:16.707811876 +0000
+++ namedSrc/net/minecraft/client/network/ClientPlayerEntity.java	2023-06-17 19:44:25.850218045 +0000
@@ -268,13 +268,15 @@
     */
    private float mountJumpStrength;
    /**
-    * Mapping not found
+    * @mapping {@literal hashed f_jfhotzll Lnet/minecraft/unmapped/C_jlopmfei;f_jfhotzll:F}
+    * @mapping {@literal named screenSwirlIntensity Lnet/minecraft/client/network/ClientPlayerEntity;screenSwirlIntensity:F}
     */
-   public float f_jfhotzll;
+   public float screenSwirlIntensity;
    /**
-    * Mapping not found
+    * @mapping {@literal hashed f_ztnegqze Lnet/minecraft/unmapped/C_jlopmfei;f_ztnegqze:F}
+    * @mapping {@literal named lastScreenSwirlIntensity Lnet/minecraft/client/network/ClientPlayerEntity;lastScreenSwirlIntensity:F}
     */
-   public float f_ztnegqze;
+   public float lastScreenSwirlIntensity;
    /**
     * @mapping {@literal hashed f_rudpemlr Lnet/minecraft/unmapped/C_jlopmfei;f_rudpemlr:Z}
     * @mapping {@literal named usingItem Lnet/minecraft/client/network/ClientPlayerEntity;usingItem:Z}
@@ -534,7 +536,7 @@
    @Override
    public void requestRespawn() {
       this.networkHandler.sendPacket(new ClientStatusUpdateC2SPacket(ClientStatusUpdateC2SPacket.Mode.PERFORM_RESPAWN));
-      KeyBind.m_lgozeqdn();
+      KeyBind.unpressStickyKeys();
    }
 
    /**
@@ -1068,7 +1070,7 @@
       }
 
       if (!(this.client.currentScreen instanceof DownloadingTerrainScreen)) {
-         this.updateNausea();
+         this.updateScreenSwirl();
       }
 
       boolean bl = this.input.jumping;
@@ -1235,10 +1237,10 @@
 
    /**
     * @mapping {@literal hashed m_xdficjfl Lnet/minecraft/unmapped/C_jlopmfei;m_xdficjfl()V}
-    * @mapping {@literal named updateNausea Lnet/minecraft/client/network/ClientPlayerEntity;updateNausea()V}
+    * @mapping {@literal named updateScreenSwirl Lnet/minecraft/client/network/ClientPlayerEntity;updateScreenSwirl()V}
     */
-   private void updateNausea() {
-      this.f_ztnegqze = this.f_jfhotzll;
+   private void updateScreenSwirl() {
+      this.lastScreenSwirlIntensity = this.screenSwirlIntensity;
       float f = 0.0F;
       if (this.inNetherPortal) {
          if (this.client.currentScreen != null && !this.client.currentScreen.isPauseScreen() && !(this.client.currentScreen instanceof DeathScreen)) {
@@ -1249,7 +1251,7 @@
             this.client.setScreen(null);
          }
 
-         if (this.f_jfhotzll == 0.0F) {
+         if (this.screenSwirlIntensity == 0.0F) {
             this.client.getSoundManager().play(PositionedSoundInstance.ambient(SoundEvents.BLOCK_PORTAL_TRIGGER, this.random.nextFloat() * 0.4F + 0.8F, 0.25F));
          }
 
@@ -1257,11 +1259,11 @@
          this.inNetherPortal = false;
       } else if (this.hasStatusEffect(StatusEffects.NAUSEA) && !this.getStatusEffect(StatusEffects.NAUSEA).endsWithin(60)) {
          f = 0.006666667F;
-      } else if (this.f_jfhotzll > 0.0F) {
+      } else if (this.screenSwirlIntensity > 0.0F) {
          f = -0.05F;
       }
 
-      this.f_jfhotzll = MathHelper.clamp(this.f_jfhotzll + f, 0.0F, 1.0F);
+      this.screenSwirlIntensity = MathHelper.clamp(this.screenSwirlIntensity + f, 0.0F, 1.0F);
       this.tickNetherPortalCooldown();
    }
 
@@ -1294,8 +1296,8 @@
    @Override
    public StatusEffectInstance removeStatusEffectInternal(@Nullable StatusEffect type) {
       if (type == StatusEffects.NAUSEA) {
-         this.f_ztnegqze = 0.0F;
-         this.f_jfhotzll = 0.0F;
+         this.lastScreenSwirlIntensity = 0.0F;
+         this.screenSwirlIntensity = 0.0F;
       }
 
       return super.removeStatusEffectInternal(type);
diff -bur namedTargetSrc/net/minecraft/client/network/ClientPlayNetworkHandler.java namedSrc/net/minecraft/client/network/ClientPlayNetworkHandler.java
--- namedTargetSrc/net/minecraft/client/network/ClientPlayNetworkHandler.java	2023-06-17 19:46:16.767814848 +0000
+++ namedSrc/net/minecraft/client/network/ClientPlayNetworkHandler.java	2023-06-17 19:44:25.922222006 +0000
@@ -1425,8 +1425,8 @@
       lv6.setShowsDeathScreen(lv3.showsDeathScreen());
       lv6.setLastDeathPos(packet.getLastDeathPos());
       lv6.setNetherPortalCooldown(packet.getNetherPortalCooldown());
-      lv6.f_jfhotzll = lv3.f_jfhotzll;
-      lv6.f_ztnegqze = lv3.f_ztnegqze;
+      lv6.screenSwirlIntensity = lv3.screenSwirlIntensity;
+      lv6.lastScreenSwirlIntensity = lv3.lastScreenSwirlIntensity;
       if (this.client.currentScreen instanceof DeathScreen || this.client.currentScreen instanceof DeathScreen.ConfirmTitleExitScreen) {
          this.client.setScreen(null);
       }
diff -bur namedTargetSrc/net/minecraft/client/option/GameOptions.java namedSrc/net/minecraft/client/option/GameOptions.java
--- namedTargetSrc/net/minecraft/client/option/GameOptions.java	2023-06-17 19:46:16.751814055 +0000
+++ namedSrc/net/minecraft/client/option/GameOptions.java	2023-06-17 19:44:25.906221126 +0000
@@ -476,7 +476,7 @@
       Option.emptyTooltip(),
       Option.optionEnumText(),
       new Option.EnumValueSet<>(
-         Arrays.asList(Arm.values()), Codec.STRING.xmap(string -> "left".equals(string) ? Arm.LEFT : Arm.RIGHT, arg -> arg == Arm.LEFT ? "left" : "right")
+         Arrays.asList(Arm.values()), Codec.STRING.xmap(string -> "left".equals(string) ? Arm.LEFT : Arm.RIGHT, value -> value == Arm.LEFT ? "left" : "right")
       ),
       Arm.RIGHT,
       value -> this.sendClientSettings()
@@ -749,7 +749,7 @@
     */
    private final Map<SoundCategory, Option<Double>> soundVolumeLevels = Util.make(new EnumMap(SoundCategory.class), value -> {
       for (SoundCategory lv : SoundCategory.values()) {
-         value.put(lv, this.createSoundVolumeIOption("soundCategory." + lv.getName(), lv));
+         value.put(lv, this.createSoundVolumeOption("soundCategory." + lv.getName(), lv));
       }
    });
    /**
@@ -840,7 +840,7 @@
     * @mapping {@literal named toggleableSprint Lnet/minecraft/client/option/GameOptions;toggleableSprint:Lnet/minecraft/client/option/Option;}
     */
    private final Option<Boolean> toggleableSprint = new Option<>(
-      "key.sprint", Option.emptyTooltip(), (optionText, value) -> value ? TOGGLE_KEY_TEXT : HOLD_KEY_TEXT, Option.BOOLEAN_VALUES, false, arg -> {
+      "key.sprint", Option.emptyTooltip(), (optionText, value) -> value ? TOGGLE_KEY_TEXT : HOLD_KEY_TEXT, Option.BOOLEAN_VALUES, false, value -> {
       }
    );
    /**
@@ -1209,7 +1209,7 @@
          };
       },
       new Option.IntRangeValueSet(30, 110),
-      Codec.DOUBLE.xmap(arg -> (int)(arg * 40.0 + 70.0), value -> ((double)value.intValue() - 70.0) / 40.0),
+      Codec.DOUBLE.xmap(doubleValue -> (int)(doubleValue * 40.0 + 70.0), value -> ((double)value.intValue() - 70.0) / 40.0),
       70,
       value -> MinecraftClient.getInstance().worldRenderer.scheduleTerrainUpdate()
    );
@@ -1365,13 +1365,15 @@
    }, Option.UnitDoubleValueSet.INSTANCE, 0.5, value -> {
    });
    /**
-    * Mapping not found
+    * @mapping {@literal hashed f_pryrouxn Lnet/minecraft/unmapped/C_lscptbhn;f_pryrouxn:I}
+    * @mapping {@literal named AUTO_GUI_SCALE Lnet/minecraft/client/option/GameOptions;AUTO_GUI_SCALE:I}
     */
-   public static final int f_pryrouxn = 0;
+   public static final int AUTO_GUI_SCALE = 0;
    /**
-    * Mapping not found
+    * @mapping {@literal hashed f_zmnjmtvo Lnet/minecraft/unmapped/C_lscptbhn;f_zmnjmtvo:I}
+    * @mapping {@literal named MAX_GUI_SCALE Lnet/minecraft/client/option/GameOptions;MAX_GUI_SCALE:I}
     */
-   private static final int f_zmnjmtvo = 2147483646;
+   private static final int MAX_GUI_SCALE = 2147483646;
    /**
     * @mapping {@literal hashed f_rmnhpbwf Lnet/minecraft/unmapped/C_lscptbhn;f_rmnhpbwf:Lnet/minecraft/unmapped/C_vbibxkxv;}
     * @mapping {@literal named guiScale Lnet/minecraft/client/option/GameOptions;guiScale:Lnet/minecraft/client/option/Option;}
@@ -1862,16 +1864,16 @@
 
    /**
     * @mapping {@literal hashed m_wennyfeo Lnet/minecraft/unmapped/C_lscptbhn;m_wennyfeo(Ljava/lang/String;Lnet/minecraft/unmapped/C_pqzizukq;)Lnet/minecraft/unmapped/C_vbibxkxv;}
-    * @mapping {@literal named createSoundVolumeIOption Lnet/minecraft/client/option/GameOptions;createSoundVolumeIOption(Ljava/lang/String;Lnet/minecraft/sound/SoundCategory;)Lnet/minecraft/client/option/Option;}
+    * @mapping {@literal named createSoundVolumeOption Lnet/minecraft/client/option/GameOptions;createSoundVolumeOption(Ljava/lang/String;Lnet/minecraft/sound/SoundCategory;)Lnet/minecraft/client/option/Option;}
     */
-   private Option<Double> createSoundVolumeIOption(String key, SoundCategory category) {
+   private Option<Double> createSoundVolumeOption(String key, SoundCategory category) {
       return new Option<>(
          key,
          Option.emptyTooltip(),
-         (arg, value) -> value == 0.0 ? getGenericValueText(arg, CommonTexts.OFF) : getPercentValueText(arg, value),
+         (option, value) -> value == 0.0 ? getGenericValueText(option, CommonTexts.OFF) : getPercentValueText(option, value),
          Option.UnitDoubleValueSet.INSTANCE,
          1.0,
-         arg2 -> MinecraftClient.getInstance().getSoundManager().updateSoundVolume(category, arg2.floatValue())
+         value -> MinecraftClient.getInstance().getSoundManager().updateSoundVolume(category, value.floatValue())
       );
    }
 
@@ -2256,12 +2258,12 @@
          BufferedReader bufferedReader = Files.newReader(this.optionsFile, Charsets.UTF_8);
 
          try {
-            bufferedReader.lines().forEach(string -> {
+            bufferedReader.lines().forEach(line -> {
                try {
-                  Iterator<String> exceptionx = COLON_SPLITTER.split(string).iterator();
+                  Iterator<String> exceptionx = COLON_SPLITTER.split(line).iterator();
                   lv.putString((String)exceptionx.next(), (String)exceptionx.next());
                } catch (Exception var3) {
-                  LOGGER.warn("Skipping bad option: {}", string);
+                  LOGGER.warn("Skipping bad option: {}", line);
                }
             });
          } catch (Throwable var6) {
diff -bur namedTargetSrc/net/minecraft/client/option/KeyBind.java namedSrc/net/minecraft/client/option/KeyBind.java
--- namedTargetSrc/net/minecraft/client/option/KeyBind.java	2023-06-17 19:46:16.747813857 +0000
+++ namedSrc/net/minecraft/client/option/KeyBind.java	2023-06-17 19:44:25.898220686 +0000
@@ -151,21 +151,22 @@
 
    /**
     * @mapping {@literal hashed m_godmkzch Lnet/minecraft/unmapped/C_sygikzty;m_godmkzch()V}
-    * @mapping {@literal named unpressAll Lnet/minecraft/client/option/KeyBind;unpressAll()V}
+    * @mapping {@literal named resetAll Lnet/minecraft/client/option/KeyBind;resetAll()V}
     */
-   public static void unpressAll() {
+   public static void resetAll() {
       for (KeyBind lv : KEY_BINDS.values()) {
          lv.reset();
       }
    }
 
    /**
-    * Mapping not found
+    * @mapping {@literal hashed m_lgozeqdn Lnet/minecraft/unmapped/C_sygikzty;m_lgozeqdn()V}
+    * @mapping {@literal named unpressStickyKeys Lnet/minecraft/client/option/KeyBind;unpressStickyKeys()V}
     */
-   public static void m_lgozeqdn() {
+   public static void unpressStickyKeys() {
       for (KeyBind lv : KEY_BINDS.values()) {
          if (lv instanceof StickyKeyBind lv2) {
-            lv2.m_zdayqktm();
+            lv2.unpress();
          }
       }
    }
diff -bur namedTargetSrc/net/minecraft/client/option/Option.java namedSrc/net/minecraft/client/option/Option.java
--- namedTargetSrc/net/minecraft/client/option/Option.java	2023-06-17 19:46:16.667809894 +0000
+++ namedSrc/net/minecraft/client/option/Option.java	2023-06-17 19:44:25.798215183 +0000
@@ -191,7 +191,7 @@
     * @mapping {@literal named emptyTooltip Lnet/minecraft/client/option/Option;emptyTooltip()Lnet/minecraft/client/option/Option$TooltipSupplier;}
     */
    public static <T> Option.TooltipSupplier<T> emptyTooltip() {
-      return optionValue -> null;
+      return value -> null;
    }
 
    /**
@@ -199,7 +199,7 @@
     * @mapping {@literal named constantTooltip Lnet/minecraft/client/option/Option;constantTooltip(Lnet/minecraft/text/Text;)Lnet/minecraft/client/option/Option$TooltipSupplier;}
     */
    public static <T> Option.TooltipSupplier<T> constantTooltip(Text text) {
-      return object -> Tooltip.create(text);
+      return value -> Tooltip.create(text);
    }
 
    /**
@@ -211,19 +211,20 @@
    }
 
    /**
-    * Mapping not found
+    * @mapping {@literal hashed m_ffpjahoa Lnet/minecraft/unmapped/C_vbibxkxv;m_ffpjahoa(Lnet/minecraft/unmapped/C_lscptbhn;III)Lnet/minecraft/unmapped/C_kpvuxmkp;}
+    * @mapping {@literal named createButton Lnet/minecraft/client/option/Option;createButton(Lnet/minecraft/client/option/GameOptions;III)Lnet/minecraft/client/gui/widget/ClickableWidget;}
     */
-   public ClickableWidget m_ffpjahoa(GameOptions arg, int i, int j, int k) {
-      return this.m_ayuyezwm(arg, i, j, k, object -> {
+   public ClickableWidget createButton(GameOptions options, int x, int y, int width) {
+      return this.createButton(options, x, y, width, callback -> {
       });
    }
 
    /**
     * @mapping {@literal hashed m_ayuyezwm Lnet/minecraft/unmapped/C_vbibxkxv;m_ayuyezwm(Lnet/minecraft/unmapped/C_lscptbhn;IIILjava/util/function/Consumer;)Lnet/minecraft/unmapped/C_kpvuxmkp;}
-    * @mapping {@literal named m_ayuyezwm Lnet/minecraft/client/option/Option;m_ayuyezwm(Lnet/minecraft/client/option/GameOptions;IIILjava/util/function/Consumer;)Lnet/minecraft/client/gui/widget/ClickableWidget;}
+    * @mapping {@literal named createButton Lnet/minecraft/client/option/Option;createButton(Lnet/minecraft/client/option/GameOptions;IIILjava/util/function/Consumer;)Lnet/minecraft/client/gui/widget/ClickableWidget;}
     */
-   public ClickableWidget m_ayuyezwm(GameOptions options, int i, int j, int k, Consumer<T> consumer) {
-      return (ClickableWidget)this.values.getButtonCreator(this.tooltip, options, i, j, k, consumer).apply(this);
+   public ClickableWidget createButton(GameOptions options, int x, int y, int width, Consumer<T> callback) {
+      return (ClickableWidget)this.values.getButtonCreator(this.tooltip, options, x, y, width, callback).apply(this);
    }
 
    /**
@@ -590,20 +591,20 @@
        */
       OptionSliderWidgetImpl(
          GameOptions options,
-         int i,
-         int j,
-         int k,
-         int l,
-         Option<N> arg2,
-         Option.SliderValueSet<N> arg3,
+         int x,
+         int y,
+         int width,
+         int height,
+         Option<N> option,
+         Option.SliderValueSet<N> values,
          Option.TooltipSupplier<N> tooltipSupplier,
-         Consumer<N> consumer
+         Consumer<N> callback
       ) {
-         super(options, i, j, k, l, arg3.toSliderValue(arg2.get()));
-         this.option = arg2;
-         this.values = arg3;
+         super(options, x, y, width, height, values.toSliderValue(option.get()));
+         this.option = option;
+         this.values = values;
          this.tooltipSupplier = tooltipSupplier;
-         this.callback = consumer;
+         this.callback = callback;
          this.updateMessage();
       }
 
@@ -681,7 +682,7 @@
        * @mapping {@literal named apply Lnet/minecraft/client/option/Option$TooltipSupplier;apply(Ljava/lang/Object;)Lnet/minecraft/client/gui/tooltip/Tooltip;}
        */
       @Nullable
-      Tooltip apply(T object);
+      Tooltip apply(T value);
    }
 
    /**
diff -bur namedTargetSrc/net/minecraft/client/option/StickyKeyBind.java namedSrc/net/minecraft/client/option/StickyKeyBind.java
--- namedTargetSrc/net/minecraft/client/option/StickyKeyBind.java	2023-06-17 19:46:16.719812470 +0000
+++ namedSrc/net/minecraft/client/option/StickyKeyBind.java	2023-06-17 19:44:25.866218925 +0000
@@ -41,9 +41,10 @@
    }
 
    /**
-    * Mapping not found
+    * @mapping {@literal hashed m_zdayqktm Lnet/minecraft/unmapped/C_ppppwawd;m_zdayqktm()V}
+    * @mapping {@literal named unpress Lnet/minecraft/client/option/StickyKeyBind;unpress()V}
     */
-   protected void m_zdayqktm() {
+   protected void unpress() {
       super.setPressed(false);
    }
 }
diff -bur namedTargetSrc/net/minecraft/client/render/animation/AnimationKeyframe.java namedSrc/net/minecraft/client/render/animation/AnimationKeyframe.java
--- namedTargetSrc/net/minecraft/client/render/animation/AnimationKeyframe.java	2023-06-17 19:46:16.727812866 +0000
+++ namedSrc/net/minecraft/client/render/animation/AnimationKeyframe.java	2023-06-17 19:44:25.878219585 +0000
@@ -9,5 +9,5 @@
  * @mapping {@literal named net/minecraft/client/render/animation/AnimationKeyframe}
  */
 @Environment(EnvType.CLIENT)
-public record AnimationKeyframe(float timestamp, Vector3f transformation, PartAnimation.Interpolator interpolator) {
+public record AnimationKeyframe(float timestamp, Vector3f transformation, PartAnimation.Interpolation interpolation) {
 }
diff -bur namedTargetSrc/net/minecraft/client/render/animation/Animator.java namedSrc/net/minecraft/client/render/animation/Animator.java
--- namedTargetSrc/net/minecraft/client/render/animation/Animator.java	2023-06-17 19:46:16.779815442 +0000
+++ namedSrc/net/minecraft/client/render/animation/Animator.java	2023-06-17 19:44:25.938222887 +0000
@@ -40,7 +40,7 @@
                   k = 0.0F;
                }
 
-               lv2.interpolator().apply(vector, k, lvs, i, j, strength);
+               lv2.interpolation().apply(vector, k, lvs, i, j, strength);
                animationx.transformation().apply(part, vector);
             }));
       }
diff -bur namedTargetSrc/net/minecraft/client/render/animation/PartAnimation.java namedSrc/net/minecraft/client/render/animation/PartAnimation.java
--- namedTargetSrc/net/minecraft/client/render/animation/PartAnimation.java	2023-06-17 19:46:16.603806724 +0000
+++ namedSrc/net/minecraft/client/render/animation/PartAnimation.java	2023-06-17 19:44:25.718210781 +0000
@@ -37,37 +37,37 @@
 
    /**
     * @mapping {@literal hashed net/minecraft/unmapped/C_vqduzjim$C_nhjvwdgr}
-    * @mapping {@literal named net/minecraft/client/render/animation/PartAnimation$Interpolator}
+    * @mapping {@literal named net/minecraft/client/render/animation/PartAnimation$Interpolation}
     */
    @Environment(EnvType.CLIENT)
-   public interface Interpolator {
+   public interface Interpolation {
       /**
        * @mapping {@literal hashed apply Lnet/minecraft/unmapped/C_vqduzjim$C_nhjvwdgr;apply(Lorg/joml/Vector3f;F[Lnet/minecraft/unmapped/C_dwpbsgze;IIF)Lorg/joml/Vector3f;}
-       * @mapping {@literal named apply Lnet/minecraft/client/render/animation/PartAnimation$Interpolator;apply(Lorg/joml/Vector3f;F[Lnet/minecraft/client/render/animation/AnimationKeyframe;IIF)Lorg/joml/Vector3f;}
+       * @mapping {@literal named apply Lnet/minecraft/client/render/animation/PartAnimation$Interpolation;apply(Lorg/joml/Vector3f;F[Lnet/minecraft/client/render/animation/AnimationKeyframe;IIF)Lorg/joml/Vector3f;}
        */
       Vector3f apply(Vector3f vector, float delta, AnimationKeyframe[] keyframes, int start, int end, float strength);
    }
 
    /**
     * @mapping {@literal hashed net/minecraft/unmapped/C_vqduzjim$C_dpnvgeww}
-    * @mapping {@literal named net/minecraft/client/render/animation/PartAnimation$Interpolators}
+    * @mapping {@literal named net/minecraft/client/render/animation/PartAnimation$Interpolations}
     */
    @Environment(EnvType.CLIENT)
-   public static class Interpolators {
+   public static class Interpolations {
       /**
        * @mapping {@literal hashed f_dpfoxzst Lnet/minecraft/unmapped/C_vqduzjim$C_dpnvgeww;f_dpfoxzst:Lnet/minecraft/unmapped/C_vqduzjim$C_nhjvwdgr;}
-       * @mapping {@literal named LINEAR Lnet/minecraft/client/render/animation/PartAnimation$Interpolators;LINEAR:Lnet/minecraft/client/render/animation/PartAnimation$Interpolator;}
+       * @mapping {@literal named LINEAR Lnet/minecraft/client/render/animation/PartAnimation$Interpolations;LINEAR:Lnet/minecraft/client/render/animation/PartAnimation$Interpolation;}
        */
-      public static final PartAnimation.Interpolator LINEAR = (vector, delta, keyframes, currentFrame, targetFrame, strength) -> {
+      public static final PartAnimation.Interpolation LINEAR = (vector, delta, keyframes, currentFrame, targetFrame, strength) -> {
          Vector3f vector3f2 = keyframes[currentFrame].transformation();
          Vector3f vector3f3 = keyframes[targetFrame].transformation();
          return vector3f2.lerp(vector3f3, delta, vector).mul(strength);
       };
       /**
        * @mapping {@literal hashed f_zajnogbp Lnet/minecraft/unmapped/C_vqduzjim$C_dpnvgeww;f_zajnogbp:Lnet/minecraft/unmapped/C_vqduzjim$C_nhjvwdgr;}
-       * @mapping {@literal named SPLINE Lnet/minecraft/client/render/animation/PartAnimation$Interpolators;SPLINE:Lnet/minecraft/client/render/animation/PartAnimation$Interpolator;}
+       * @mapping {@literal named SPLINE Lnet/minecraft/client/render/animation/PartAnimation$Interpolations;SPLINE:Lnet/minecraft/client/render/animation/PartAnimation$Interpolation;}
        */
-      public static final PartAnimation.Interpolator SPLINE = (vector, delta, keyframes, currentFrame, targetFrame, strength) -> {
+      public static final PartAnimation.Interpolation SPLINE = (vector, delta, keyframes, currentFrame, targetFrame, strength) -> {
          Vector3f vector3f2 = keyframes[Math.max(0, currentFrame - 1)].transformation();
          Vector3f vector3f3 = keyframes[currentFrame].transformation();
          Vector3f vector3f4 = keyframes[targetFrame].transformation();

@github-actions
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

View the diff here (3/3): 
diff -bur namedTargetSrc/net/minecraft/client/render/entity/animation/CamelEntityAnimations.java namedSrc/net/minecraft/client/render/entity/animation/CamelEntityAnimations.java
--- namedTargetSrc/net/minecraft/client/render/entity/animation/CamelEntityAnimations.java	2023-06-17 19:46:16.719812470 +0000
+++ namedSrc/net/minecraft/client/render/entity/animation/CamelEntityAnimations.java	2023-06-17 19:44:25.866218925 +0000
@@ -23,129 +23,129 @@
          "root",
          new PartAnimation(
             PartAnimation.AnimationTargets.ROTATE,
-            new AnimationKeyframe(0.0F, Animator.rotate(0.0F, 0.0F, 2.5F), PartAnimation.Interpolators.SPLINE),
-            new AnimationKeyframe(1.0F, Animator.rotate(0.0F, 0.0F, -2.5F), PartAnimation.Interpolators.SPLINE),
-            new AnimationKeyframe(1.5F, Animator.rotate(0.0F, 0.0F, 2.5F), PartAnimation.Interpolators.SPLINE)
+            new AnimationKeyframe(0.0F, Animator.rotate(0.0F, 0.0F, 2.5F), PartAnimation.Interpolations.SPLINE),
+            new AnimationKeyframe(1.0F, Animator.rotate(0.0F, 0.0F, -2.5F), PartAnimation.Interpolations.SPLINE),
+            new AnimationKeyframe(1.5F, Animator.rotate(0.0F, 0.0F, 2.5F), PartAnimation.Interpolations.SPLINE)
          )
       )
       .addPartAnimation(
          "head",
          new PartAnimation(
             PartAnimation.AnimationTargets.ROTATE,
-            new AnimationKeyframe(0.0F, Animator.rotate(2.5F, 0.0F, 0.0F), PartAnimation.Interpolators.SPLINE),
-            new AnimationKeyframe(0.375F, Animator.rotate(-2.5F, 0.0F, 0.0F), PartAnimation.Interpolators.SPLINE),
-            new AnimationKeyframe(0.75F, Animator.rotate(2.5F, 0.0F, 0.0F), PartAnimation.Interpolators.SPLINE),
-            new AnimationKeyframe(1.125F, Animator.rotate(-2.5F, 0.0F, 0.0F), PartAnimation.Interpolators.SPLINE),
-            new AnimationKeyframe(1.5F, Animator.rotate(2.5F, 0.0F, 0.0F), PartAnimation.Interpolators.SPLINE)
+            new AnimationKeyframe(0.0F, Animator.rotate(2.5F, 0.0F, 0.0F), PartAnimation.Interpolations.SPLINE),
+            new AnimationKeyframe(0.375F, Animator.rotate(-2.5F, 0.0F, 0.0F), PartAnimation.Interpolations.SPLINE),
+            new AnimationKeyframe(0.75F, Animator.rotate(2.5F, 0.0F, 0.0F), PartAnimation.Interpolations.SPLINE),
+            new AnimationKeyframe(1.125F, Animator.rotate(-2.5F, 0.0F, 0.0F), PartAnimation.Interpolations.SPLINE),
+            new AnimationKeyframe(1.5F, Animator.rotate(2.5F, 0.0F, 0.0F), PartAnimation.Interpolations.SPLINE)
          )
       )
       .addPartAnimation(
          "right_front_leg",
          new PartAnimation(
             PartAnimation.AnimationTargets.ROTATE,
-            new AnimationKeyframe(0.0F, Animator.rotate(22.5F, 0.0F, 0.0F), PartAnimation.Interpolators.SPLINE),
-            new AnimationKeyframe(0.75F, Animator.rotate(-22.5F, 0.0F, 0.0F), PartAnimation.Interpolators.SPLINE),
-            new AnimationKeyframe(1.5F, Animator.rotate(22.5F, 0.0F, 0.0F), PartAnimation.Interpolators.SPLINE)
+            new AnimationKeyframe(0.0F, Animator.rotate(22.5F, 0.0F, 0.0F), PartAnimation.Interpolations.SPLINE),
+            new AnimationKeyframe(0.75F, Animator.rotate(-22.5F, 0.0F, 0.0F), PartAnimation.Interpolations.SPLINE),
+            new AnimationKeyframe(1.5F, Animator.rotate(22.5F, 0.0F, 0.0F), PartAnimation.Interpolations.SPLINE)
          )
       )
       .addPartAnimation(
          "right_front_leg",
          new PartAnimation(
             PartAnimation.AnimationTargets.TRANSLATE,
-            new AnimationKeyframe(0.0F, Animator.translate(0.0F, 0.0F, 0.0F), PartAnimation.Interpolators.SPLINE),
-            new AnimationKeyframe(0.4583F, Animator.translate(0.0F, 4.0F, 0.0F), PartAnimation.Interpolators.SPLINE),
-            new AnimationKeyframe(0.75F, Animator.translate(0.0F, 0.0F, 0.0F), PartAnimation.Interpolators.SPLINE),
-            new AnimationKeyframe(1.5F, Animator.translate(0.0F, 0.0F, 0.0F), PartAnimation.Interpolators.SPLINE)
+            new AnimationKeyframe(0.0F, Animator.translate(0.0F, 0.0F, 0.0F), PartAnimation.Interpolations.SPLINE),
+            new AnimationKeyframe(0.4583F, Animator.translate(0.0F, 4.0F, 0.0F), PartAnimation.Interpolations.SPLINE),
+            new AnimationKeyframe(0.75F, Animator.translate(0.0F, 0.0F, 0.0F), PartAnimation.Interpolations.SPLINE),
+            new AnimationKeyframe(1.5F, Animator.translate(0.0F, 0.0F, 0.0F), PartAnimation.Interpolations.SPLINE)
          )
       )
       .addPartAnimation(
          "left_front_leg",
          new PartAnimation(
             PartAnimation.AnimationTargets.ROTATE,
-            new AnimationKeyframe(0.0F, Animator.rotate(-22.5F, 0.0F, 0.0F), PartAnimation.Interpolators.SPLINE),
-            new AnimationKeyframe(0.75F, Animator.rotate(22.5F, 0.0F, 0.0F), PartAnimation.Interpolators.SPLINE),
-            new AnimationKeyframe(1.5F, Animator.rotate(-22.5F, 0.0F, 0.0F), PartAnimation.Interpolators.SPLINE)
+            new AnimationKeyframe(0.0F, Animator.rotate(-22.5F, 0.0F, 0.0F), PartAnimation.Interpolations.SPLINE),
+            new AnimationKeyframe(0.75F, Animator.rotate(22.5F, 0.0F, 0.0F), PartAnimation.Interpolations.SPLINE),
+            new AnimationKeyframe(1.5F, Animator.rotate(-22.5F, 0.0F, 0.0F), PartAnimation.Interpolations.SPLINE)
          )
       )
       .addPartAnimation(
          "left_front_leg",
          new PartAnimation(
             PartAnimation.AnimationTargets.TRANSLATE,
-            new AnimationKeyframe(0.0F, Animator.translate(0.0F, 0.0F, 0.0F), PartAnimation.Interpolators.SPLINE),
-            new AnimationKeyframe(0.75F, Animator.translate(0.0F, 0.0F, 0.0F), PartAnimation.Interpolators.SPLINE),
-            new AnimationKeyframe(1.2083F, Animator.translate(0.0F, 4.0F, 0.0F), PartAnimation.Interpolators.SPLINE),
-            new AnimationKeyframe(1.5F, Animator.translate(0.0F, 0.0F, 0.0F), PartAnimation.Interpolators.SPLINE)
+            new AnimationKeyframe(0.0F, Animator.translate(0.0F, 0.0F, 0.0F), PartAnimation.Interpolations.SPLINE),
+            new AnimationKeyframe(0.75F, Animator.translate(0.0F, 0.0F, 0.0F), PartAnimation.Interpolations.SPLINE),
+            new AnimationKeyframe(1.2083F, Animator.translate(0.0F, 4.0F, 0.0F), PartAnimation.Interpolations.SPLINE),
+            new AnimationKeyframe(1.5F, Animator.translate(0.0F, 0.0F, 0.0F), PartAnimation.Interpolations.SPLINE)
          )
       )
       .addPartAnimation(
          "left_hind_leg",
          new PartAnimation(
             PartAnimation.AnimationTargets.ROTATE,
-            new AnimationKeyframe(0.0F, Animator.rotate(-20.4F, 0.0F, 0.0F), PartAnimation.Interpolators.SPLINE),
-            new AnimationKeyframe(0.75F, Animator.rotate(22.5F, 0.0F, 0.0F), PartAnimation.Interpolators.SPLINE),
-            new AnimationKeyframe(1.375F, Animator.rotate(-22.5F, 0.0F, 0.0F), PartAnimation.Interpolators.LINEAR),
-            new AnimationKeyframe(1.5F, Animator.rotate(-20.4F, 0.0F, 0.0F), PartAnimation.Interpolators.LINEAR)
+            new AnimationKeyframe(0.0F, Animator.rotate(-20.4F, 0.0F, 0.0F), PartAnimation.Interpolations.SPLINE),
+            new AnimationKeyframe(0.75F, Animator.rotate(22.5F, 0.0F, 0.0F), PartAnimation.Interpolations.SPLINE),
+            new AnimationKeyframe(1.375F, Animator.rotate(-22.5F, 0.0F, 0.0F), PartAnimation.Interpolations.LINEAR),
+            new AnimationKeyframe(1.5F, Animator.rotate(-20.4F, 0.0F, 0.0F), PartAnimation.Interpolations.LINEAR)
          )
       )
       .addPartAnimation(
          "left_hind_leg",
          new PartAnimation(
             PartAnimation.AnimationTargets.TRANSLATE,
-            new AnimationKeyframe(0.0F, Animator.translate(0.0F, -0.21F, 0.0F), PartAnimation.Interpolators.SPLINE),
-            new AnimationKeyframe(0.75F, Animator.translate(0.0F, 0.0F, 0.0F), PartAnimation.Interpolators.SPLINE),
-            new AnimationKeyframe(1.0833F, Animator.translate(0.0F, 4.0F, 0.0F), PartAnimation.Interpolators.SPLINE),
-            new AnimationKeyframe(1.375F, Animator.translate(0.0F, 0.0F, 0.0F), PartAnimation.Interpolators.LINEAR),
-            new AnimationKeyframe(1.5F, Animator.translate(0.0F, -0.21F, 0.0F), PartAnimation.Interpolators.LINEAR)
+            new AnimationKeyframe(0.0F, Animator.translate(0.0F, -0.21F, 0.0F), PartAnimation.Interpolations.SPLINE),
+            new AnimationKeyframe(0.75F, Animator.translate(0.0F, 0.0F, 0.0F), PartAnimation.Interpolations.SPLINE),
+            new AnimationKeyframe(1.0833F, Animator.translate(0.0F, 4.0F, 0.0F), PartAnimation.Interpolations.SPLINE),
+            new AnimationKeyframe(1.375F, Animator.translate(0.0F, 0.0F, 0.0F), PartAnimation.Interpolations.LINEAR),
+            new AnimationKeyframe(1.5F, Animator.translate(0.0F, -0.21F, 0.0F), PartAnimation.Interpolations.LINEAR)
          )
       )
       .addPartAnimation(
          "right_hind_leg",
          new PartAnimation(
             PartAnimation.AnimationTargets.ROTATE,
-            new AnimationKeyframe(0.0F, Animator.rotate(22.5F, 0.0F, 0.0F), PartAnimation.Interpolators.SPLINE),
-            new AnimationKeyframe(0.625F, Animator.rotate(-22.5F, 0.0F, 0.0F), PartAnimation.Interpolators.SPLINE),
-            new AnimationKeyframe(1.5F, Animator.rotate(22.5F, 0.0F, 0.0F), PartAnimation.Interpolators.SPLINE)
+            new AnimationKeyframe(0.0F, Animator.rotate(22.5F, 0.0F, 0.0F), PartAnimation.Interpolations.SPLINE),
+            new AnimationKeyframe(0.625F, Animator.rotate(-22.5F, 0.0F, 0.0F), PartAnimation.Interpolations.SPLINE),
+            new AnimationKeyframe(1.5F, Animator.rotate(22.5F, 0.0F, 0.0F), PartAnimation.Interpolations.SPLINE)
          )
       )
       .addPartAnimation(
          "right_hind_leg",
          new PartAnimation(
             PartAnimation.AnimationTargets.TRANSLATE,
-            new AnimationKeyframe(0.0F, Animator.translate(0.0F, 0.0F, 0.0F), PartAnimation.Interpolators.SPLINE),
-            new AnimationKeyframe(0.375F, Animator.translate(0.0F, 4.0F, 0.0F), PartAnimation.Interpolators.SPLINE),
-            new AnimationKeyframe(0.625F, Animator.translate(0.0F, 0.0F, 0.0F), PartAnimation.Interpolators.SPLINE),
-            new AnimationKeyframe(1.5F, Animator.translate(0.0F, 0.0F, 0.0F), PartAnimation.Interpolators.SPLINE)
+            new AnimationKeyframe(0.0F, Animator.translate(0.0F, 0.0F, 0.0F), PartAnimation.Interpolations.SPLINE),
+            new AnimationKeyframe(0.375F, Animator.translate(0.0F, 4.0F, 0.0F), PartAnimation.Interpolations.SPLINE),
+            new AnimationKeyframe(0.625F, Animator.translate(0.0F, 0.0F, 0.0F), PartAnimation.Interpolations.SPLINE),
+            new AnimationKeyframe(1.5F, Animator.translate(0.0F, 0.0F, 0.0F), PartAnimation.Interpolations.SPLINE)
          )
       )
       .addPartAnimation(
          "left_ear",
          new PartAnimation(
             PartAnimation.AnimationTargets.ROTATE,
-            new AnimationKeyframe(0.0F, Animator.rotate(0.0F, 0.0F, 0.0F), PartAnimation.Interpolators.SPLINE),
-            new AnimationKeyframe(0.375F, Animator.rotate(0.0F, 0.0F, -22.5F), PartAnimation.Interpolators.SPLINE),
-            new AnimationKeyframe(0.75F, Animator.rotate(0.0F, 0.0F, 0.0F), PartAnimation.Interpolators.SPLINE),
-            new AnimationKeyframe(1.125F, Animator.rotate(0.0F, 0.0F, -22.5F), PartAnimation.Interpolators.SPLINE),
-            new AnimationKeyframe(1.5F, Animator.rotate(0.0F, 0.0F, 0.0F), PartAnimation.Interpolators.SPLINE)
+            new AnimationKeyframe(0.0F, Animator.rotate(0.0F, 0.0F, 0.0F), PartAnimation.Interpolations.SPLINE),
+            new AnimationKeyframe(0.375F, Animator.rotate(0.0F, 0.0F, -22.5F), PartAnimation.Interpolations.SPLINE),
+            new AnimationKeyframe(0.75F, Animator.rotate(0.0F, 0.0F, 0.0F), PartAnimation.Interpolations.SPLINE),
+            new AnimationKeyframe(1.125F, Animator.rotate(0.0F, 0.0F, -22.5F), PartAnimation.Interpolations.SPLINE),
+            new AnimationKeyframe(1.5F, Animator.rotate(0.0F, 0.0F, 0.0F), PartAnimation.Interpolations.SPLINE)
          )
       )
       .addPartAnimation(
          "right_ear",
          new PartAnimation(
             PartAnimation.AnimationTargets.ROTATE,
-            new AnimationKeyframe(0.0F, Animator.rotate(0.0F, 0.0F, 0.0F), PartAnimation.Interpolators.SPLINE),
-            new AnimationKeyframe(0.375F, Animator.rotate(0.0F, 0.0F, 22.5F), PartAnimation.Interpolators.SPLINE),
-            new AnimationKeyframe(0.75F, Animator.rotate(0.0F, 0.0F, 0.0F), PartAnimation.Interpolators.SPLINE),
-            new AnimationKeyframe(1.125F, Animator.rotate(0.0F, 0.0F, 22.5F), PartAnimation.Interpolators.SPLINE),
-            new AnimationKeyframe(1.5F, Animator.rotate(0.0F, 0.0F, 0.0F), PartAnimation.Interpolators.SPLINE)
+            new AnimationKeyframe(0.0F, Animator.rotate(0.0F, 0.0F, 0.0F), PartAnimation.Interpolations.SPLINE),
+            new AnimationKeyframe(0.375F, Animator.rotate(0.0F, 0.0F, 22.5F), PartAnimation.Interpolations.SPLINE),
+            new AnimationKeyframe(0.75F, Animator.rotate(0.0F, 0.0F, 0.0F), PartAnimation.Interpolations.SPLINE),
+            new AnimationKeyframe(1.125F, Animator.rotate(0.0F, 0.0F, 22.5F), PartAnimation.Interpolations.SPLINE),
+            new AnimationKeyframe(1.5F, Animator.rotate(0.0F, 0.0F, 0.0F), PartAnimation.Interpolations.SPLINE)
          )
       )
       .addPartAnimation(
          "tail",
          new PartAnimation(
             PartAnimation.AnimationTargets.ROTATE,
-            new AnimationKeyframe(0.0F, Animator.rotate(15.94102F, -8.42106F, 20.94102F), PartAnimation.Interpolators.SPLINE),
-            new AnimationKeyframe(0.75F, Animator.rotate(15.94102F, 8.42106F, -20.94102F), PartAnimation.Interpolators.SPLINE),
-            new AnimationKeyframe(1.5F, Animator.rotate(15.94102F, -8.42106F, 20.94102F), PartAnimation.Interpolators.SPLINE)
+            new AnimationKeyframe(0.0F, Animator.rotate(15.94102F, -8.42106F, 20.94102F), PartAnimation.Interpolations.SPLINE),
+            new AnimationKeyframe(0.75F, Animator.rotate(15.94102F, 8.42106F, -20.94102F), PartAnimation.Interpolations.SPLINE),
+            new AnimationKeyframe(1.5F, Animator.rotate(15.94102F, -8.42106F, 20.94102F), PartAnimation.Interpolations.SPLINE)
          )
       )
       .build();
@@ -158,130 +158,130 @@
          "body",
          new PartAnimation(
             PartAnimation.AnimationTargets.ROTATE,
-            new AnimationKeyframe(0.0F, Animator.rotate(0.0F, 0.0F, 0.0F), PartAnimation.Interpolators.LINEAR),
-            new AnimationKeyframe(1.3F, Animator.rotate(30.0F, 0.0F, 0.0F), PartAnimation.Interpolators.LINEAR),
-            new AnimationKeyframe(1.8F, Animator.rotate(24.0F, 0.0F, 0.0F), PartAnimation.Interpolators.LINEAR),
-            new AnimationKeyframe(2.0F, Animator.rotate(0.0F, 0.0F, 0.0F), PartAnimation.Interpolators.LINEAR)
+            new AnimationKeyframe(0.0F, Animator.rotate(0.0F, 0.0F, 0.0F), PartAnimation.Interpolations.LINEAR),
+            new AnimationKeyframe(1.3F, Animator.rotate(30.0F, 0.0F, 0.0F), PartAnimation.Interpolations.LINEAR),
+            new AnimationKeyframe(1.8F, Animator.rotate(24.0F, 0.0F, 0.0F), PartAnimation.Interpolations.LINEAR),
+            new AnimationKeyframe(2.0F, Animator.rotate(0.0F, 0.0F, 0.0F), PartAnimation.Interpolations.LINEAR)
          )
       )
       .addPartAnimation(
          "body",
          new PartAnimation(
             PartAnimation.AnimationTargets.TRANSLATE,
-            new AnimationKeyframe(0.0F, Animator.translate(0.0F, 0.0F, 0.0F), PartAnimation.Interpolators.LINEAR),
-            new AnimationKeyframe(1.3F, Animator.translate(0.0F, 0.0F, 1.0F), PartAnimation.Interpolators.LINEAR),
-            new AnimationKeyframe(1.8F, Animator.translate(0.0F, -6.0F, 1.0F), PartAnimation.Interpolators.LINEAR),
-            new AnimationKeyframe(2.0F, Animator.translate(0.0F, -19.9F, 0.0F), PartAnimation.Interpolators.LINEAR)
+            new AnimationKeyframe(0.0F, Animator.translate(0.0F, 0.0F, 0.0F), PartAnimation.Interpolations.LINEAR),
+            new AnimationKeyframe(1.3F, Animator.translate(0.0F, 0.0F, 1.0F), PartAnimation.Interpolations.LINEAR),
+            new AnimationKeyframe(1.8F, Animator.translate(0.0F, -6.0F, 1.0F), PartAnimation.Interpolations.LINEAR),
+            new AnimationKeyframe(2.0F, Animator.translate(0.0F, -19.9F, 0.0F), PartAnimation.Interpolations.LINEAR)
          )
       )
       .addPartAnimation(
          "right_front_leg",
          new PartAnimation(
             PartAnimation.AnimationTargets.ROTATE,
-            new AnimationKeyframe(0.0F, Animator.rotate(0.0F, 0.0F, 0.0F), PartAnimation.Interpolators.LINEAR),
-            new AnimationKeyframe(1.0F, Animator.rotate(-30.0F, 0.0F, 0.0F), PartAnimation.Interpolators.LINEAR),
-            new AnimationKeyframe(1.5F, Animator.rotate(-30.0F, 0.0F, 0.0F), PartAnimation.Interpolators.LINEAR),
-            new AnimationKeyframe(2.0F, Animator.rotate(-90.0F, 10.0F, 0.0F), PartAnimation.Interpolators.LINEAR)
+            new AnimationKeyframe(0.0F, Animator.rotate(0.0F, 0.0F, 0.0F), PartAnimation.Interpolations.LINEAR),
+            new AnimationKeyframe(1.0F, Animator.rotate(-30.0F, 0.0F, 0.0F), PartAnimation.Interpolations.LINEAR),
+            new AnimationKeyframe(1.5F, Animator.rotate(-30.0F, 0.0F, 0.0F), PartAnimation.Interpolations.LINEAR),
+            new AnimationKeyframe(2.0F, Animator.rotate(-90.0F, 10.0F, 0.0F), PartAnimation.Interpolations.LINEAR)
          )
       )
       .addPartAnimation(
          "right_front_leg",
          new PartAnimation(
             PartAnimation.AnimationTargets.TRANSLATE,
-            new AnimationKeyframe(0.0F, Animator.translate(0.0F, 0.0F, 0.0F), PartAnimation.Interpolators.LINEAR),
-            new AnimationKeyframe(1.0F, Animator.translate(0.0F, -2.0F, 11.0F), PartAnimation.Interpolators.LINEAR),
-            new AnimationKeyframe(1.5F, Animator.translate(0.0F, -2.0F, 11.0F), PartAnimation.Interpolators.LINEAR),
-            new AnimationKeyframe(1.7F, Animator.translate(0.0F, -8.4F, 11.4F), PartAnimation.Interpolators.LINEAR),
-            new AnimationKeyframe(2.0F, Animator.translate(0.0F, -20.6F, 12.0F), PartAnimation.Interpolators.LINEAR)
+            new AnimationKeyframe(0.0F, Animator.translate(0.0F, 0.0F, 0.0F), PartAnimation.Interpolations.LINEAR),
+            new AnimationKeyframe(1.0F, Animator.translate(0.0F, -2.0F, 11.0F), PartAnimation.Interpolations.LINEAR),
+            new AnimationKeyframe(1.5F, Animator.translate(0.0F, -2.0F, 11.0F), PartAnimation.Interpolations.LINEAR),
+            new AnimationKeyframe(1.7F, Animator.translate(0.0F, -8.4F, 11.4F), PartAnimation.Interpolations.LINEAR),
+            new AnimationKeyframe(2.0F, Animator.translate(0.0F, -20.6F, 12.0F), PartAnimation.Interpolations.LINEAR)
          )
       )
       .addPartAnimation(
          "left_front_leg",
          new PartAnimation(
             PartAnimation.AnimationTargets.ROTATE,
-            new AnimationKeyframe(0.0F, Animator.rotate(0.0F, 0.0F, 0.0F), PartAnimation.Interpolators.LINEAR),
-            new AnimationKeyframe(1.0F, Animator.rotate(-30.0F, 0.0F, 0.0F), PartAnimation.Interpolators.LINEAR),
-            new AnimationKeyframe(1.5F, Animator.rotate(-30.0F, 0.0F, 0.0F), PartAnimation.Interpolators.LINEAR),
-            new AnimationKeyframe(2.0F, Animator.rotate(-90.0F, -10.0F, 0.0F), PartAnimation.Interpolators.LINEAR)
+            new AnimationKeyframe(0.0F, Animator.rotate(0.0F, 0.0F, 0.0F), PartAnimation.Interpolations.LINEAR),
+            new AnimationKeyframe(1.0F, Animator.rotate(-30.0F, 0.0F, 0.0F), PartAnimation.Interpolations.LINEAR),
+            new AnimationKeyframe(1.5F, Animator.rotate(-30.0F, 0.0F, 0.0F), PartAnimation.Interpolations.LINEAR),
+            new AnimationKeyframe(2.0F, Animator.rotate(-90.0F, -10.0F, 0.0F), PartAnimation.Interpolations.LINEAR)
          )
       )
       .addPartAnimation(
          "left_front_leg",
          new PartAnimation(
             PartAnimation.AnimationTargets.TRANSLATE,
-            new AnimationKeyframe(0.0F, Animator.translate(0.0F, 0.0F, 0.0F), PartAnimation.Interpolators.LINEAR),
-            new AnimationKeyframe(1.0F, Animator.translate(0.0F, -2.0F, 11.0F), PartAnimation.Interpolators.LINEAR),
-            new AnimationKeyframe(1.5F, Animator.translate(0.0F, -2.0F, 11.0F), PartAnimation.Interpolators.LINEAR),
-            new AnimationKeyframe(1.7F, Animator.translate(0.0F, -8.4F, 11.4F), PartAnimation.Interpolators.LINEAR),
-            new AnimationKeyframe(2.0F, Animator.translate(0.0F, -20.6F, 12.0F), PartAnimation.Interpolators.LINEAR)
+            new AnimationKeyframe(0.0F, Animator.translate(0.0F, 0.0F, 0.0F), PartAnimation.Interpolations.LINEAR),
+            new AnimationKeyframe(1.0F, Animator.translate(0.0F, -2.0F, 11.0F), PartAnimation.Interpolations.LINEAR),
+            new AnimationKeyframe(1.5F, Animator.translate(0.0F, -2.0F, 11.0F), PartAnimation.Interpolations.LINEAR),
+            new AnimationKeyframe(1.7F, Animator.translate(0.0F, -8.4F, 11.4F), PartAnimation.Interpolations.LINEAR),
+            new AnimationKeyframe(2.0F, Animator.translate(0.0F, -20.6F, 12.0F), PartAnimation.Interpolations.LINEAR)
          )
       )
       .addPartAnimation(
          "left_hind_leg",
          new PartAnimation(
             PartAnimation.AnimationTargets.ROTATE,
-            new AnimationKeyframe(0.0F, Animator.rotate(0.0F, 0.0F, 0.0F), PartAnimation.Interpolators.LINEAR),
-            new AnimationKeyframe(0.5F, Animator.rotate(0.0F, 0.0F, 0.0F), PartAnimation.Interpolators.LINEAR),
-            new AnimationKeyframe(1.5F, Animator.rotate(-10.0F, 0.0F, 0.0F), PartAnimation.Interpolators.LINEAR),
-            new AnimationKeyframe(1.7F, Animator.rotate(-15.0F, -3.0F, 0.0F), PartAnimation.Interpolators.LINEAR),
-            new AnimationKeyframe(1.9F, Animator.rotate(-65.0F, -9.0F, 0.0F), PartAnimation.Interpolators.LINEAR),
-            new AnimationKeyframe(2.0F, Animator.rotate(-90.0F, -15.0F, 0.0F), PartAnimation.Interpolators.LINEAR)
+            new AnimationKeyframe(0.0F, Animator.rotate(0.0F, 0.0F, 0.0F), PartAnimation.Interpolations.LINEAR),
+            new AnimationKeyframe(0.5F, Animator.rotate(0.0F, 0.0F, 0.0F), PartAnimation.Interpolations.LINEAR),
+            new AnimationKeyframe(1.5F, Animator.rotate(-10.0F, 0.0F, 0.0F), PartAnimation.Interpolations.LINEAR),
+            new AnimationKeyframe(1.7F, Animator.rotate(-15.0F, -3.0F, 0.0F), PartAnimation.Interpolations.LINEAR),
+            new AnimationKeyframe(1.9F, Animator.rotate(-65.0F, -9.0F, 0.0F), PartAnimation.Interpolations.LINEAR),
+            new AnimationKeyframe(2.0F, Animator.rotate(-90.0F, -15.0F, 0.0F), PartAnimation.Interpolations.LINEAR)
          )
       )
       .addPartAnimation(
          "left_hind_leg",
          new PartAnimation(
             PartAnimation.AnimationTargets.TRANSLATE,
-            new AnimationKeyframe(0.0F, Animator.translate(0.0F, 0.0F, 0.0F), PartAnimation.Interpolators.LINEAR),
-            new AnimationKeyframe(0.5F, Animator.translate(0.0F, 0.0F, 0.0F), PartAnimation.Interpolators.LINEAR),
-            new AnimationKeyframe(1.5F, Animator.translate(0.0F, 0.0F, 1.0F), PartAnimation.Interpolators.LINEAR),
-            new AnimationKeyframe(1.7F, Animator.translate(1.0F, -0.62F, 0.25F), PartAnimation.Interpolators.LINEAR),
-            new AnimationKeyframe(1.9F, Animator.translate(0.5F, -11.25F, 2.5F), PartAnimation.Interpolators.LINEAR),
-            new AnimationKeyframe(2.0F, Animator.translate(1.0F, -20.5F, 5.0F), PartAnimation.Interpolators.LINEAR)
+            new AnimationKeyframe(0.0F, Animator.translate(0.0F, 0.0F, 0.0F), PartAnimation.Interpolations.LINEAR),
+            new AnimationKeyframe(0.5F, Animator.translate(0.0F, 0.0F, 0.0F), PartAnimation.Interpolations.LINEAR),
+            new AnimationKeyframe(1.5F, Animator.translate(0.0F, 0.0F, 1.0F), PartAnimation.Interpolations.LINEAR),
+            new AnimationKeyframe(1.7F, Animator.translate(1.0F, -0.62F, 0.25F), PartAnimation.Interpolations.LINEAR),
+            new AnimationKeyframe(1.9F, Animator.translate(0.5F, -11.25F, 2.5F), PartAnimation.Interpolations.LINEAR),
+            new AnimationKeyframe(2.0F, Animator.translate(1.0F, -20.5F, 5.0F), PartAnimation.Interpolations.LINEAR)
          )
       )
       .addPartAnimation(
          "right_hind_leg",
          new PartAnimation(
             PartAnimation.AnimationTargets.ROTATE,
-            new AnimationKeyframe(0.0F, Animator.rotate(0.0F, 0.0F, 0.0F), PartAnimation.Interpolators.LINEAR),
-            new AnimationKeyframe(0.5F, Animator.rotate(0.0F, 0.0F, 0.0F), PartAnimation.Interpolators.LINEAR),
-            new AnimationKeyframe(1.5F, Animator.rotate(-10.0F, 0.0F, 0.0F), PartAnimation.Interpolators.LINEAR),
-            new AnimationKeyframe(1.7F, Animator.rotate(-15.0F, 3.0F, 0.0F), PartAnimation.Interpolators.LINEAR),
-            new AnimationKeyframe(1.9F, Animator.rotate(-65.0F, 9.0F, 0.0F), PartAnimation.Interpolators.LINEAR),
-            new AnimationKeyframe(2.0F, Animator.rotate(-90.0F, 15.0F, 0.0F), PartAnimation.Interpolators.LINEAR)
+            new AnimationKeyframe(0.0F, Animator.rotate(0.0F, 0.0F, 0.0F), PartAnimation.Interpolations.LINEAR),
+            new AnimationKeyframe(0.5F, Animator.rotate(0.0F, 0.0F, 0.0F), PartAnimation.Interpolations.LINEAR),
+            new AnimationKeyframe(1.5F, Animator.rotate(-10.0F, 0.0F, 0.0F), PartAnimation.Interpolations.LINEAR),
+            new AnimationKeyframe(1.7F, Animator.rotate(-15.0F, 3.0F, 0.0F), PartAnimation.Interpolations.LINEAR),
+            new AnimationKeyframe(1.9F, Animator.rotate(-65.0F, 9.0F, 0.0F), PartAnimation.Interpolations.LINEAR),
+            new AnimationKeyframe(2.0F, Animator.rotate(-90.0F, 15.0F, 0.0F), PartAnimation.Interpolations.LINEAR)
          )
       )
       .addPartAnimation(
          "right_hind_leg",
          new PartAnimation(
             PartAnimation.AnimationTargets.TRANSLATE,
-            new AnimationKeyframe(0.0F, Animator.translate(0.0F, 0.0F, 0.0F), PartAnimation.Interpolators.LINEAR),
-            new AnimationKeyframe(0.5F, Animator.translate(0.0F, 0.0F, 0.0F), PartAnimation.Interpolators.LINEAR),
-            new AnimationKeyframe(1.5F, Animator.translate(0.0F, 0.0F, 1.0F), PartAnimation.Interpolators.LINEAR),
-            new AnimationKeyframe(1.7F, Animator.translate(-1.0F, -0.62F, 0.25F), PartAnimation.Interpolators.LINEAR),
-            new AnimationKeyframe(1.9F, Animator.translate(-0.5F, -11.25F, 2.5F), PartAnimation.Interpolators.LINEAR),
-            new AnimationKeyframe(2.0F, Animator.translate(-1.0F, -20.5F, 5.0F), PartAnimation.Interpolators.LINEAR)
+            new AnimationKeyframe(0.0F, Animator.translate(0.0F, 0.0F, 0.0F), PartAnimation.Interpolations.LINEAR),
+            new AnimationKeyframe(0.5F, Animator.translate(0.0F, 0.0F, 0.0F), PartAnimation.Interpolations.LINEAR),
+            new AnimationKeyframe(1.5F, Animator.translate(0.0F, 0.0F, 1.0F), PartAnimation.Interpolations.LINEAR),
+            new AnimationKeyframe(1.7F, Animator.translate(-1.0F, -0.62F, 0.25F), PartAnimation.Interpolations.LINEAR),
+            new AnimationKeyframe(1.9F, Animator.translate(-0.5F, -11.25F, 2.5F), PartAnimation.Interpolations.LINEAR),
+            new AnimationKeyframe(2.0F, Animator.translate(-1.0F, -20.5F, 5.0F), PartAnimation.Interpolations.LINEAR)
          )
       )
       .addPartAnimation(
          "head",
          new PartAnimation(
             PartAnimation.AnimationTargets.ROTATE,
-            new AnimationKeyframe(0.0F, Animator.rotate(0.0F, 0.0F, 0.0F), PartAnimation.Interpolators.LINEAR),
-            new AnimationKeyframe(0.7F, Animator.rotate(-27.5F, 0.0F, 0.0F), PartAnimation.Interpolators.LINEAR),
-            new AnimationKeyframe(1.5F, Animator.rotate(-21.25F, 0.0F, 0.0F), PartAnimation.Interpolators.LINEAR),
-            new AnimationKeyframe(2.0F, Animator.rotate(0.0F, 0.0F, 0.0F), PartAnimation.Interpolators.LINEAR)
+            new AnimationKeyframe(0.0F, Animator.rotate(0.0F, 0.0F, 0.0F), PartAnimation.Interpolations.LINEAR),
+            new AnimationKeyframe(0.7F, Animator.rotate(-27.5F, 0.0F, 0.0F), PartAnimation.Interpolations.LINEAR),
+            new AnimationKeyframe(1.5F, Animator.rotate(-21.25F, 0.0F, 0.0F), PartAnimation.Interpolations.LINEAR),
+            new AnimationKeyframe(2.0F, Animator.rotate(0.0F, 0.0F, 0.0F), PartAnimation.Interpolations.LINEAR)
          )
       )
       .addPartAnimation(
          "tail",
          new PartAnimation(
             PartAnimation.AnimationTargets.ROTATE,
-            new AnimationKeyframe(0.0F, Animator.rotate(5.0F, 0.0F, 0.0F), PartAnimation.Interpolators.LINEAR),
-            new AnimationKeyframe(1.7F, Animator.rotate(5.0F, 0.0F, 0.0F), PartAnimation.Interpolators.LINEAR),
-            new AnimationKeyframe(1.9F, Animator.rotate(80.0F, 0.0F, 0.0F), PartAnimation.Interpolators.LINEAR),
-            new AnimationKeyframe(2.0F, Animator.rotate(50.0F, 0.0F, 0.0F), PartAnimation.Interpolators.LINEAR)
+            new AnimationKeyframe(0.0F, Animator.rotate(5.0F, 0.0F, 0.0F), PartAnimation.Interpolations.LINEAR),
+            new AnimationKeyframe(1.7F, Animator.rotate(5.0F, 0.0F, 0.0F), PartAnimation.Interpolations.LINEAR),
+            new AnimationKeyframe(1.9F, Animator.rotate(80.0F, 0.0F, 0.0F), PartAnimation.Interpolations.LINEAR),
+            new AnimationKeyframe(2.0F, Animator.rotate(50.0F, 0.0F, 0.0F), PartAnimation.Interpolations.LINEAR)
          )
       )
       .build();
@@ -294,96 +294,96 @@
          "body",
          new PartAnimation(
             PartAnimation.AnimationTargets.ROTATE,
-            new AnimationKeyframe(0.0F, Animator.rotate(0.0F, 0.0F, 0.0F), PartAnimation.Interpolators.LINEAR),
-            new AnimationKeyframe(1.0F, Animator.rotate(0.0F, 0.0F, 0.0F), PartAnimation.Interpolators.LINEAR)
+            new AnimationKeyframe(0.0F, Animator.rotate(0.0F, 0.0F, 0.0F), PartAnimation.Interpolations.LINEAR),
+            new AnimationKeyframe(1.0F, Animator.rotate(0.0F, 0.0F, 0.0F), PartAnimation.Interpolations.LINEAR)
          )
       )
       .addPartAnimation(
          "body",
          new PartAnimation(
             PartAnimation.AnimationTargets.TRANSLATE,
-            new AnimationKeyframe(0.0F, Animator.translate(0.0F, -19.9F, 0.0F), PartAnimation.Interpolators.LINEAR),
-            new AnimationKeyframe(1.0F, Animator.translate(0.0F, -19.9F, 0.0F), PartAnimation.Interpolators.LINEAR)
+            new AnimationKeyframe(0.0F, Animator.translate(0.0F, -19.9F, 0.0F), PartAnimation.Interpolations.LINEAR),
+            new AnimationKeyframe(1.0F, Animator.translate(0.0F, -19.9F, 0.0F), PartAnimation.Interpolations.LINEAR)
          )
       )
       .addPartAnimation(
          "right_front_leg",
          new PartAnimation(
             PartAnimation.AnimationTargets.ROTATE,
-            new AnimationKeyframe(0.0F, Animator.rotate(-90.0F, 10.0F, 0.0F), PartAnimation.Interpolators.LINEAR),
-            new AnimationKeyframe(1.0F, Animator.rotate(-90.0F, 10.0F, 0.0F), PartAnimation.Interpolators.LINEAR)
+            new AnimationKeyframe(0.0F, Animator.rotate(-90.0F, 10.0F, 0.0F), PartAnimation.Interpolations.LINEAR),
+            new AnimationKeyframe(1.0F, Animator.rotate(-90.0F, 10.0F, 0.0F), PartAnimation.Interpolations.LINEAR)
          )
       )
       .addPartAnimation(
          "right_front_leg",
          new PartAnimation(
             PartAnimation.AnimationTargets.TRANSLATE,
-            new AnimationKeyframe(0.0F, Animator.translate(0.0F, -20.6F, 12.0F), PartAnimation.Interpolators.LINEAR),
-            new AnimationKeyframe(1.0F, Animator.translate(0.0F, -20.6F, 12.0F), PartAnimation.Interpolators.LINEAR)
+            new AnimationKeyframe(0.0F, Animator.translate(0.0F, -20.6F, 12.0F), PartAnimation.Interpolations.LINEAR),
+            new AnimationKeyframe(1.0F, Animator.translate(0.0F, -20.6F, 12.0F), PartAnimation.Interpolations.LINEAR)
          )
       )
       .addPartAnimation(
          "left_front_leg",
          new PartAnimation(
             PartAnimation.AnimationTargets.ROTATE,
-            new AnimationKeyframe(0.0F, Animator.rotate(-90.0F, -10.0F, 0.0F), PartAnimation.Interpolators.LINEAR),
-            new AnimationKeyframe(1.0F, Animator.rotate(-90.0F, -10.0F, 0.0F), PartAnimation.Interpolators.LINEAR)
+            new AnimationKeyframe(0.0F, Animator.rotate(-90.0F, -10.0F, 0.0F), PartAnimation.Interpolations.LINEAR),
+            new AnimationKeyframe(1.0F, Animator.rotate(-90.0F, -10.0F, 0.0F), PartAnimation.Interpolations.LINEAR)
          )
       )
       .addPartAnimation(
          "left_front_leg",
          new PartAnimation(
             PartAnimation.AnimationTargets.TRANSLATE,
-            new AnimationKeyframe(0.0F, Animator.translate(0.0F, -20.6F, 12.0F), PartAnimation.Interpolators.LINEAR),
-            new AnimationKeyframe(1.0F, Animator.translate(0.0F, -20.6F, 12.0F), PartAnimation.Interpolators.LINEAR)
+            new AnimationKeyframe(0.0F, Animator.translate(0.0F, -20.6F, 12.0F), PartAnimation.Interpolations.LINEAR),
+            new AnimationKeyframe(1.0F, Animator.translate(0.0F, -20.6F, 12.0F), PartAnimation.Interpolations.LINEAR)
          )
       )
       .addPartAnimation(
          "left_hind_leg",
          new PartAnimation(
             PartAnimation.AnimationTargets.ROTATE,
-            new AnimationKeyframe(0.0F, Animator.rotate(-90.0F, -15.0F, 0.0F), PartAnimation.Interpolators.LINEAR),
-            new AnimationKeyframe(1.0F, Animator.rotate(-90.0F, -15.0F, 0.0F), PartAnimation.Interpolators.LINEAR)
+            new AnimationKeyframe(0.0F, Animator.rotate(-90.0F, -15.0F, 0.0F), PartAnimation.Interpolations.LINEAR),
+            new AnimationKeyframe(1.0F, Animator.rotate(-90.0F, -15.0F, 0.0F), PartAnimation.Interpolations.LINEAR)
          )
       )
       .addPartAnimation(
          "left_hind_leg",
          new PartAnimation(
             PartAnimation.AnimationTargets.TRANSLATE,
-            new AnimationKeyframe(0.0F, Animator.translate(1.0F, -20.5F, 5.0F), PartAnimation.Interpolators.LINEAR),
-            new AnimationKeyframe(1.0F, Animator.translate(1.0F, -20.5F, 5.0F), PartAnimation.Interpolators.LINEAR)
+            new AnimationKeyframe(0.0F, Animator.translate(1.0F, -20.5F, 5.0F), PartAnimation.Interpolations.LINEAR),
+            new AnimationKeyframe(1.0F, Animator.translate(1.0F, -20.5F, 5.0F), PartAnimation.Interpolations.LINEAR)
          )
       )
       .addPartAnimation(
          "right_hind_leg",
          new PartAnimation(
             PartAnimation.AnimationTargets.ROTATE,
-            new AnimationKeyframe(0.0F, Animator.rotate(-90.0F, 15.0F, 0.0F), PartAnimation.Interpolators.LINEAR),
-            new AnimationKeyframe(1.0F, Animator.rotate(-90.0F, 15.0F, 0.0F), PartAnimation.Interpolators.LINEAR)
+            new AnimationKeyframe(0.0F, Animator.rotate(-90.0F, 15.0F, 0.0F), PartAnimation.Interpolations.LINEAR),
+            new AnimationKeyframe(1.0F, Animator.rotate(-90.0F, 15.0F, 0.0F), PartAnimation.Interpolations.LINEAR)
          )
       )
       .addPartAnimation(
          "right_hind_leg",
          new PartAnimation(
             PartAnimation.AnimationTargets.TRANSLATE,
-            new AnimationKeyframe(0.0F, Animator.translate(-1.0F, -20.5F, 5.0F), PartAnimation.Interpolators.LINEAR),
-            new AnimationKeyframe(1.0F, Animator.translate(-1.0F, -20.5F, 5.0F), PartAnimation.Interpolators.LINEAR)
+            new AnimationKeyframe(0.0F, Animator.translate(-1.0F, -20.5F, 5.0F), PartAnimation.Interpolations.LINEAR),
+            new AnimationKeyframe(1.0F, Animator.translate(-1.0F, -20.5F, 5.0F), PartAnimation.Interpolations.LINEAR)
          )
       )
       .addPartAnimation(
          "head",
          new PartAnimation(
             PartAnimation.AnimationTargets.ROTATE,
-            new AnimationKeyframe(0.0F, Animator.rotate(0.0F, 0.0F, 0.0F), PartAnimation.Interpolators.LINEAR),
-            new AnimationKeyframe(1.0F, Animator.rotate(0.0F, 0.0F, 0.0F), PartAnimation.Interpolators.LINEAR)
+            new AnimationKeyframe(0.0F, Animator.rotate(0.0F, 0.0F, 0.0F), PartAnimation.Interpolations.LINEAR),
+            new AnimationKeyframe(1.0F, Animator.rotate(0.0F, 0.0F, 0.0F), PartAnimation.Interpolations.LINEAR)
          )
       )
       .addPartAnimation(
          "tail",
          new PartAnimation(
             PartAnimation.AnimationTargets.ROTATE,
-            new AnimationKeyframe(0.0F, Animator.rotate(50.0F, 0.0F, 0.0F), PartAnimation.Interpolators.LINEAR),
-            new AnimationKeyframe(1.0F, Animator.rotate(50.0F, 0.0F, 0.0F), PartAnimation.Interpolators.LINEAR)
+            new AnimationKeyframe(0.0F, Animator.rotate(50.0F, 0.0F, 0.0F), PartAnimation.Interpolations.LINEAR),
+            new AnimationKeyframe(1.0F, Animator.rotate(50.0F, 0.0F, 0.0F), PartAnimation.Interpolations.LINEAR)
          )
       )
       .build();
@@ -396,147 +396,147 @@
          "body",
          new PartAnimation(
             PartAnimation.AnimationTargets.ROTATE,
-            new AnimationKeyframe(0.0F, Animator.rotate(0.0F, 0.0F, 0.0F), PartAnimation.Interpolators.LINEAR),
-            new AnimationKeyframe(0.7F, Animator.rotate(-17.5F, 0.0F, 0.0F), PartAnimation.Interpolators.SPLINE),
-            new AnimationKeyframe(1.8F, Animator.rotate(-17.83F, 0.0F, 0.0F), PartAnimation.Interpolators.SPLINE),
-            new AnimationKeyframe(2.3F, Animator.rotate(-5.83F, 0.0F, 0.0F), PartAnimation.Interpolators.LINEAR),
-            new AnimationKeyframe(2.6F, Animator.rotate(0.0F, 0.0F, 0.0F), PartAnimation.Interpolators.LINEAR)
+            new AnimationKeyframe(0.0F, Animator.rotate(0.0F, 0.0F, 0.0F), PartAnimation.Interpolations.LINEAR),
+            new AnimationKeyframe(0.7F, Animator.rotate(-17.5F, 0.0F, 0.0F), PartAnimation.Interpolations.SPLINE),
+            new AnimationKeyframe(1.8F, Animator.rotate(-17.83F, 0.0F, 0.0F), PartAnimation.Interpolations.SPLINE),
+            new AnimationKeyframe(2.3F, Animator.rotate(-5.83F, 0.0F, 0.0F), PartAnimation.Interpolations.LINEAR),
+            new AnimationKeyframe(2.6F, Animator.rotate(0.0F, 0.0F, 0.0F), PartAnimation.Interpolations.LINEAR)
          )
       )
       .addPartAnimation(
          "body",
          new PartAnimation(
             PartAnimation.AnimationTargets.TRANSLATE,
-            new AnimationKeyframe(0.0F, Animator.translate(0.0F, -19.9F, 0.0F), PartAnimation.Interpolators.LINEAR),
-            new AnimationKeyframe(0.7F, Animator.translate(0.0F, -19.9F, -3.0F), PartAnimation.Interpolators.LINEAR),
-            new AnimationKeyframe(1.4F, Animator.translate(0.0F, -12.76F, -4.0F), PartAnimation.Interpolators.SPLINE),
-            new AnimationKeyframe(1.8F, Animator.translate(0.0F, -10.1F, -4.0F), PartAnimation.Interpolators.SPLINE),
-            new AnimationKeyframe(2.3F, Animator.translate(0.0F, -2.9F, -2.0F), PartAnimation.Interpolators.LINEAR),
-            new AnimationKeyframe(2.6F, Animator.translate(0.0F, 0.0F, 0.0F), PartAnimation.Interpolators.LINEAR)
+            new AnimationKeyframe(0.0F, Animator.translate(0.0F, -19.9F, 0.0F), PartAnimation.Interpolations.LINEAR),
+            new AnimationKeyframe(0.7F, Animator.translate(0.0F, -19.9F, -3.0F), PartAnimation.Interpolations.LINEAR),
+            new AnimationKeyframe(1.4F, Animator.translate(0.0F, -12.76F, -4.0F), PartAnimation.Interpolations.SPLINE),
+            new AnimationKeyframe(1.8F, Animator.translate(0.0F, -10.1F, -4.0F), PartAnimation.Interpolations.SPLINE),
+            new AnimationKeyframe(2.3F, Animator.translate(0.0F, -2.9F, -2.0F), PartAnimation.Interpolations.LINEAR),
+            new AnimationKeyframe(2.6F, Animator.translate(0.0F, 0.0F, 0.0F), PartAnimation.Interpolations.LINEAR)
          )
       )
       .addPartAnimation(
          "right_front_leg",
          new PartAnimation(
             PartAnimation.AnimationTargets.ROTATE,
-            new AnimationKeyframe(0.0F, Animator.rotate(-90.0F, 10.0F, 0.0F), PartAnimation.Interpolators.LINEAR),
-            new AnimationKeyframe(0.5F, Animator.rotate(-90.0F, 10.0F, 0.0F), PartAnimation.Interpolators.LINEAR),
-            new AnimationKeyframe(1.1F, Animator.rotate(-49.06F, 10.0F, 0.0F), PartAnimation.Interpolators.LINEAR),
-            new AnimationKeyframe(1.8F, Animator.rotate(-22.5F, 10.0F, 0.0F), PartAnimation.Interpolators.LINEAR),
-            new AnimationKeyframe(2.3F, Animator.rotate(-25.0F, 10.0F, 0.0F), PartAnimation.Interpolators.LINEAR),
-            new AnimationKeyframe(2.6F, Animator.rotate(0.0F, 0.0F, 0.0F), PartAnimation.Interpolators.LINEAR)
+            new AnimationKeyframe(0.0F, Animator.rotate(-90.0F, 10.0F, 0.0F), PartAnimation.Interpolations.LINEAR),
+            new AnimationKeyframe(0.5F, Animator.rotate(-90.0F, 10.0F, 0.0F), PartAnimation.Interpolations.LINEAR),
+            new AnimationKeyframe(1.1F, Animator.rotate(-49.06F, 10.0F, 0.0F), PartAnimation.Interpolations.LINEAR),
+            new AnimationKeyframe(1.8F, Animator.rotate(-22.5F, 10.0F, 0.0F), PartAnimation.Interpolations.LINEAR),
+            new AnimationKeyframe(2.3F, Animator.rotate(-25.0F, 10.0F, 0.0F), PartAnimation.Interpolations.LINEAR),
+            new AnimationKeyframe(2.6F, Animator.rotate(0.0F, 0.0F, 0.0F), PartAnimation.Interpolations.LINEAR)
          )
       )
       .addPartAnimation(
          "right_front_leg",
          new PartAnimation(
             PartAnimation.AnimationTargets.TRANSLATE,
-            new AnimationKeyframe(0.0F, Animator.translate(0.0F, -20.6F, 12.0F), PartAnimation.Interpolators.LINEAR),
-            new AnimationKeyframe(0.5F, Animator.translate(0.0F, -20.6F, 8.0F), PartAnimation.Interpolators.LINEAR),
-            new AnimationKeyframe(1.1F, Animator.translate(0.0F, -7.14F, 4.42F), PartAnimation.Interpolators.LINEAR),
-            new AnimationKeyframe(1.8F, Animator.translate(0.0F, -1.27F, -1.33F), PartAnimation.Interpolators.LINEAR),
-            new AnimationKeyframe(2.3F, Animator.translate(0.0F, -1.27F, -0.33F), PartAnimation.Interpolators.LINEAR),
-            new AnimationKeyframe(2.6F, Animator.translate(0.0F, 0.0F, 0.0F), PartAnimation.Interpolators.LINEAR)
+            new AnimationKeyframe(0.0F, Animator.translate(0.0F, -20.6F, 12.0F), PartAnimation.Interpolations.LINEAR),
+            new AnimationKeyframe(0.5F, Animator.translate(0.0F, -20.6F, 8.0F), PartAnimation.Interpolations.LINEAR),
+            new AnimationKeyframe(1.1F, Animator.translate(0.0F, -7.14F, 4.42F), PartAnimation.Interpolations.LINEAR),
+            new AnimationKeyframe(1.8F, Animator.translate(0.0F, -1.27F, -1.33F), PartAnimation.Interpolations.LINEAR),
+            new AnimationKeyframe(2.3F, Animator.translate(0.0F, -1.27F, -0.33F), PartAnimation.Interpolations.LINEAR),
+            new AnimationKeyframe(2.6F, Animator.translate(0.0F, 0.0F, 0.0F), PartAnimation.Interpolations.LINEAR)
          )
       )
       .addPartAnimation(
          "left_front_leg",
          new PartAnimation(
             PartAnimation.AnimationTargets.ROTATE,
-            new AnimationKeyframe(0.0F, Animator.rotate(-90.0F, -10.0F, 0.0F), PartAnimation.Interpolators.LINEAR),
-            new AnimationKeyframe(0.5F, Animator.rotate(-90.0F, -10.0F, 0.0F), PartAnimation.Interpolators.LINEAR),
-            new AnimationKeyframe(1.1F, Animator.rotate(-49.06F, -10.0F, 0.0F), PartAnimation.Interpolators.LINEAR),
-            new AnimationKeyframe(1.8F, Animator.rotate(-22.5F, -10.0F, 0.0F), PartAnimation.Interpolators.LINEAR),
-            new AnimationKeyframe(2.3F, Animator.rotate(-25.0F, -10.0F, 0.0F), PartAnimation.Interpolators.LINEAR),
-            new AnimationKeyframe(2.6F, Animator.rotate(0.0F, 0.0F, 0.0F), PartAnimation.Interpolators.LINEAR)
+            new AnimationKeyframe(0.0F, Animator.rotate(-90.0F, -10.0F, 0.0F), PartAnimation.Interpolations.LINEAR),
+            new AnimationKeyframe(0.5F, Animator.rotate(-90.0F, -10.0F, 0.0F), PartAnimation.Interpolations.LINEAR),
+            new AnimationKeyframe(1.1F, Animator.rotate(-49.06F, -10.0F, 0.0F), PartAnimation.Interpolations.LINEAR),
+            new AnimationKeyframe(1.8F, Animator.rotate(-22.5F, -10.0F, 0.0F), PartAnimation.Interpolations.LINEAR),
+            new AnimationKeyframe(2.3F, Animator.rotate(-25.0F, -10.0F, 0.0F), PartAnimation.Interpolations.LINEAR),
+            new AnimationKeyframe(2.6F, Animator.rotate(0.0F, 0.0F, 0.0F), PartAnimation.Interpolations.LINEAR)
          )
       )
       .addPartAnimation(
          "left_front_leg",
          new PartAnimation(
             PartAnimation.AnimationTargets.TRANSLATE,
-            new AnimationKeyframe(0.0F, Animator.translate(0.0F, -20.6F, 12.0F), PartAnimation.Interpolators.LINEAR),
-            new AnimationKeyframe(0.5F, Animator.translate(0.0F, -20.6F, 8.0F), PartAnimation.Interpolators.LINEAR),
-            new AnimationKeyframe(1.1F, Animator.translate(0.0F, -7.14F, 4.42F), PartAnimation.Interpolators.LINEAR),
-            new AnimationKeyframe(1.8F, Animator.translate(0.0F, -1.27F, -1.33F), PartAnimation.Interpolators.LINEAR),
-            new AnimationKeyframe(2.3F, Animator.translate(0.0F, -1.27F, -0.33F), PartAnimation.Interpolators.LINEAR),
-            new AnimationKeyframe(2.6F, Animator.translate(0.0F, 0.0F, 0.0F), PartAnimation.Interpolators.LINEAR)
+            new AnimationKeyframe(0.0F, Animator.translate(0.0F, -20.6F, 12.0F), PartAnimation.Interpolations.LINEAR),
+            new AnimationKeyframe(0.5F, Animator.translate(0.0F, -20.6F, 8.0F), PartAnimation.Interpolations.LINEAR),
+            new AnimationKeyframe(1.1F, Animator.translate(0.0F, -7.14F, 4.42F), PartAnimation.Interpolations.LINEAR),
+            new AnimationKeyframe(1.8F, Animator.translate(0.0F, -1.27F, -1.33F), PartAnimation.Interpolations.LINEAR),
+            new AnimationKeyframe(2.3F, Animator.translate(0.0F, -1.27F, -0.33F), PartAnimation.Interpolations.LINEAR),
+            new AnimationKeyframe(2.6F, Animator.translate(0.0F, 0.0F, 0.0F), PartAnimation.Interpolations.LINEAR)
          )
       )
       .addPartAnimation(
          "left_hind_leg",
          new PartAnimation(
             PartAnimation.AnimationTargets.ROTATE,
-            new AnimationKeyframe(0.0F, Animator.rotate(-90.0F, -15.0F, 0.0F), PartAnimation.Interpolators.LINEAR),
-            new AnimationKeyframe(0.3F, Animator.rotate(-90.0F, 0.0F, 0.0F), PartAnimation.Interpolators.LINEAR),
-            new AnimationKeyframe(0.6F, Animator.rotate(-90.0F, 0.0F, 0.0F), PartAnimation.Interpolators.LINEAR),
-            new AnimationKeyframe(1.1F, Animator.rotate(-60.0F, 0.0F, 0.0F), PartAnimation.Interpolators.LINEAR),
-            new AnimationKeyframe(1.9F, Animator.rotate(35.0F, 0.0F, 0.0F), PartAnimation.Interpolators.LINEAR),
-            new AnimationKeyframe(2.2F, Animator.rotate(30.0F, 0.0F, 0.0F), PartAnimation.Interpolators.LINEAR),
-            new AnimationKeyframe(2.6F, Animator.rotate(0.0F, 0.0F, 0.0F), PartAnimation.Interpolators.LINEAR)
+            new AnimationKeyframe(0.0F, Animator.rotate(-90.0F, -15.0F, 0.0F), PartAnimation.Interpolations.LINEAR),
+            new AnimationKeyframe(0.3F, Animator.rotate(-90.0F, 0.0F, 0.0F), PartAnimation.Interpolations.LINEAR),
+            new AnimationKeyframe(0.6F, Animator.rotate(-90.0F, 0.0F, 0.0F), PartAnimation.Interpolations.LINEAR),
+            new AnimationKeyframe(1.1F, Animator.rotate(-60.0F, 0.0F, 0.0F), PartAnimation.Interpolations.LINEAR),
+            new AnimationKeyframe(1.9F, Animator.rotate(35.0F, 0.0F, 0.0F), PartAnimation.Interpolations.LINEAR),
+            new AnimationKeyframe(2.2F, Animator.rotate(30.0F, 0.0F, 0.0F), PartAnimation.Interpolations.LINEAR),
+            new AnimationKeyframe(2.6F, Animator.rotate(0.0F, 0.0F, 0.0F), PartAnimation.Interpolations.LINEAR)
          )
       )
       .addPartAnimation(
          "left_hind_leg",
          new PartAnimation(
             PartAnimation.AnimationTargets.TRANSLATE,
-            new AnimationKeyframe(0.0F, Animator.translate(1.0F, -20.5F, 5.0F), PartAnimation.Interpolators.LINEAR),
-            new AnimationKeyframe(0.3F, Animator.translate(-2.0F, -20.5F, 3.0F), PartAnimation.Interpolators.LINEAR),
-            new AnimationKeyframe(0.6F, Animator.translate(-2.0F, -20.5F, 3.0F), PartAnimation.Interpolators.LINEAR),
-            new AnimationKeyframe(1.1F, Animator.translate(-2.0F, -10.5F, 2.0F), PartAnimation.Interpolators.LINEAR),
-            new AnimationKeyframe(1.5F, Animator.translate(-2.0F, -0.4F, -3.9F), PartAnimation.Interpolators.LINEAR),
-            new AnimationKeyframe(1.9F, Animator.translate(-2.0F, -4.3F, -9.8F), PartAnimation.Interpolators.LINEAR),
-            new AnimationKeyframe(2.2F, Animator.translate(-1.0F, -2.5F, -5.0F), PartAnimation.Interpolators.LINEAR),
-            new AnimationKeyframe(2.6F, Animator.translate(0.0F, 0.0F, 0.0F), PartAnimation.Interpolators.LINEAR)
+            new AnimationKeyframe(0.0F, Animator.translate(1.0F, -20.5F, 5.0F), PartAnimation.Interpolations.LINEAR),
+            new AnimationKeyframe(0.3F, Animator.translate(-2.0F, -20.5F, 3.0F), PartAnimation.Interpolations.LINEAR),
+            new AnimationKeyframe(0.6F, Animator.translate(-2.0F, -20.5F, 3.0F), PartAnimation.Interpolations.LINEAR),
+            new AnimationKeyframe(1.1F, Animator.translate(-2.0F, -10.5F, 2.0F), PartAnimation.Interpolations.LINEAR),
+            new AnimationKeyframe(1.5F, Animator.translate(-2.0F, -0.4F, -3.9F), PartAnimation.Interpolations.LINEAR),
+            new AnimationKeyframe(1.9F, Animator.translate(-2.0F, -4.3F, -9.8F), PartAnimation.Interpolations.LINEAR),
+            new AnimationKeyframe(2.2F, Animator.translate(-1.0F, -2.5F, -5.0F), PartAnimation.Interpolations.LINEAR),
+            new AnimationKeyframe(2.6F, Animator.translate(0.0F, 0.0F, 0.0F), PartAnimation.Interpolations.LINEAR)
          )
       )
       .addPartAnimation(
          "right_hind_leg",
          new PartAnimation(
             PartAnimation.AnimationTargets.ROTATE,
-            new AnimationKeyframe(0.0F, Animator.rotate(-90.0F, 15.0F, 0.0F), PartAnimation.Interpolators.LINEAR),
-            new AnimationKeyframe(0.3F, Animator.rotate(-90.0F, 0.0F, 0.0F), PartAnimation.Interpolators.LINEAR),
-            new AnimationKeyframe(0.6F, Animator.rotate(-90.0F, 0.0F, 0.0F), PartAnimation.Interpolators.LINEAR),
-            new AnimationKeyframe(1.1F, Animator.rotate(-60.0F, 0.0F, 0.0F), PartAnimation.Interpolators.LINEAR),
-            new AnimationKeyframe(1.9F, Animator.rotate(35.0F, 0.0F, 0.0F), PartAnimation.Interpolators.LINEAR),
-            new AnimationKeyframe(2.2F, Animator.rotate(30.0F, 0.0F, 0.0F), PartAnimation.Interpolators.LINEAR),
-            new AnimationKeyframe(2.6F, Animator.rotate(0.0F, 0.0F, 0.0F), PartAnimation.Interpolators.LINEAR)
+            new AnimationKeyframe(0.0F, Animator.rotate(-90.0F, 15.0F, 0.0F), PartAnimation.Interpolations.LINEAR),
+            new AnimationKeyframe(0.3F, Animator.rotate(-90.0F, 0.0F, 0.0F), PartAnimation.Interpolations.LINEAR),
+            new AnimationKeyframe(0.6F, Animator.rotate(-90.0F, 0.0F, 0.0F), PartAnimation.Interpolations.LINEAR),
+            new AnimationKeyframe(1.1F, Animator.rotate(-60.0F, 0.0F, 0.0F), PartAnimation.Interpolations.LINEAR),
+            new AnimationKeyframe(1.9F, Animator.rotate(35.0F, 0.0F, 0.0F), PartAnimation.Interpolations.LINEAR),
+            new AnimationKeyframe(2.2F, Animator.rotate(30.0F, 0.0F, 0.0F), PartAnimation.Interpolations.LINEAR),
+            new AnimationKeyframe(2.6F, Animator.rotate(0.0F, 0.0F, 0.0F), PartAnimation.Interpolations.LINEAR)
          )
       )
       .addPartAnimation(
          "right_hind_leg",
          new PartAnimation(
             PartAnimation.AnimationTargets.TRANSLATE,
-            new AnimationKeyframe(0.0F, Animator.translate(-1.0F, -20.5F, 5.0F), PartAnimation.Interpolators.LINEAR),
-            new AnimationKeyframe(0.3F, Animator.translate(2.0F, -20.5F, 3.0F), PartAnimation.Interpolators.LINEAR),
-            new AnimationKeyframe(0.6F, Animator.translate(2.0F, -20.5F, 3.0F), PartAnimation.Interpolators.LINEAR),
-            new AnimationKeyframe(1.1F, Animator.translate(2.0F, -10.5F, 2.0F), PartAnimation.Interpolators.LINEAR),
-            new AnimationKeyframe(1.5F, Animator.translate(2.0F, -0.4F, -3.9F), PartAnimation.Interpolators.LINEAR),
-            new AnimationKeyframe(1.9F, Animator.translate(2.0F, -4.3F, -9.8F), PartAnimation.Interpolators.LINEAR),
-            new AnimationKeyframe(2.2F, Animator.translate(1.0F, -2.5F, -5.0F), PartAnimation.Interpolators.LINEAR),
-            new AnimationKeyframe(2.6F, Animator.translate(0.0F, 0.0F, 0.0F), PartAnimation.Interpolators.LINEAR)
+            new AnimationKeyframe(0.0F, Animator.translate(-1.0F, -20.5F, 5.0F), PartAnimation.Interpolations.LINEAR),
+            new AnimationKeyframe(0.3F, Animator.translate(2.0F, -20.5F, 3.0F), PartAnimation.Interpolations.LINEAR),
+            new AnimationKeyframe(0.6F, Animator.translate(2.0F, -20.5F, 3.0F), PartAnimation.Interpolations.LINEAR),
+            new AnimationKeyframe(1.1F, Animator.translate(2.0F, -10.5F, 2.0F), PartAnimation.Interpolations.LINEAR),
+            new AnimationKeyframe(1.5F, Animator.translate(2.0F, -0.4F, -3.9F), PartAnimation.Interpolations.LINEAR),
+            new AnimationKeyframe(1.9F, Animator.translate(2.0F, -4.3F, -9.8F), PartAnimation.Interpolations.LINEAR),
+            new AnimationKeyframe(2.2F, Animator.translate(1.0F, -2.5F, -5.0F), PartAnimation.Interpolations.LINEAR),
+            new AnimationKeyframe(2.6F, Animator.translate(0.0F, 0.0F, 0.0F), PartAnimation.Interpolations.LINEAR)
          )
       )
       .addPartAnimation(
          "head",
          new PartAnimation(
             PartAnimation.AnimationTargets.ROTATE,
-            new AnimationKeyframe(0.0F, Animator.rotate(0.0F, 0.0F, 0.0F), PartAnimation.Interpolators.LINEAR),
-            new AnimationKeyframe(0.3F, Animator.rotate(0.0F, 0.0F, 0.0F), PartAnimation.Interpolators.LINEAR),
-            new AnimationKeyframe(0.8F, Animator.rotate(55.0F, 0.0F, 0.0F), PartAnimation.Interpolators.LINEAR),
-            new AnimationKeyframe(2.0F, Animator.rotate(65.0F, 0.0F, 0.0F), PartAnimation.Interpolators.LINEAR),
-            new AnimationKeyframe(2.4F, Animator.rotate(0.0F, 0.0F, 0.0F), PartAnimation.Interpolators.LINEAR)
+            new AnimationKeyframe(0.0F, Animator.rotate(0.0F, 0.0F, 0.0F), PartAnimation.Interpolations.LINEAR),
+            new AnimationKeyframe(0.3F, Animator.rotate(0.0F, 0.0F, 0.0F), PartAnimation.Interpolations.LINEAR),
+            new AnimationKeyframe(0.8F, Animator.rotate(55.0F, 0.0F, 0.0F), PartAnimation.Interpolations.LINEAR),
+            new AnimationKeyframe(2.0F, Animator.rotate(65.0F, 0.0F, 0.0F), PartAnimation.Interpolations.LINEAR),
+            new AnimationKeyframe(2.4F, Animator.rotate(0.0F, 0.0F, 0.0F), PartAnimation.Interpolations.LINEAR)
          )
       )
       .addPartAnimation(
          "tail",
          new PartAnimation(
             PartAnimation.AnimationTargets.ROTATE,
-            new AnimationKeyframe(0.0F, Animator.rotate(50.0F, 0.0F, 0.0F), PartAnimation.Interpolators.LINEAR),
-            new AnimationKeyframe(0.4F, Animator.rotate(55.0F, 0.0F, 0.0F), PartAnimation.Interpolators.LINEAR),
-            new AnimationKeyframe(0.9F, Animator.rotate(55.0F, 0.0F, 0.0F), PartAnimation.Interpolators.LINEAR),
-            new AnimationKeyframe(1.5F, Animator.rotate(17.5F, 0.0F, 0.0F), PartAnimation.Interpolators.LINEAR),
-            new AnimationKeyframe(2.6F, Animator.rotate(5.0F, 0.0F, 0.0F), PartAnimation.Interpolators.LINEAR)
+            new AnimationKeyframe(0.0F, Animator.rotate(50.0F, 0.0F, 0.0F), PartAnimation.Interpolations.LINEAR),
+            new AnimationKeyframe(0.4F, Animator.rotate(55.0F, 0.0F, 0.0F), PartAnimation.Interpolations.LINEAR),
+            new AnimationKeyframe(0.9F, Animator.rotate(55.0F, 0.0F, 0.0F), PartAnimation.Interpolations.LINEAR),
+            new AnimationKeyframe(1.5F, Animator.rotate(17.5F, 0.0F, 0.0F), PartAnimation.Interpolations.LINEAR),
+            new AnimationKeyframe(2.6F, Animator.rotate(5.0F, 0.0F, 0.0F), PartAnimation.Interpolations.LINEAR)
          )
       )
       .build();
@@ -550,90 +550,90 @@
          "body",
          new PartAnimation(
             PartAnimation.AnimationTargets.ROTATE,
-            new AnimationKeyframe(0.0F, Animator.rotate(5.0F, 0.0F, 0.0F), PartAnimation.Interpolators.LINEAR),
-            new AnimationKeyframe(0.5F, Animator.rotate(5.0F, 0.0F, 0.0F), PartAnimation.Interpolators.LINEAR)
+            new AnimationKeyframe(0.0F, Animator.rotate(5.0F, 0.0F, 0.0F), PartAnimation.Interpolations.LINEAR),
+            new AnimationKeyframe(0.5F, Animator.rotate(5.0F, 0.0F, 0.0F), PartAnimation.Interpolations.LINEAR)
          )
       )
       .addPartAnimation(
          "tail",
          new PartAnimation(
             PartAnimation.AnimationTargets.ROTATE,
-            new AnimationKeyframe(0.0F, Animator.rotate(67.5F, 0.0F, 0.0F), PartAnimation.Interpolators.SPLINE),
-            new AnimationKeyframe(0.125F, Animator.rotate(112.5F, 0.0F, 0.0F), PartAnimation.Interpolators.SPLINE),
-            new AnimationKeyframe(0.25F, Animator.rotate(67.5F, 0.0F, 0.0F), PartAnimation.Interpolators.SPLINE),
-            new AnimationKeyframe(0.375F, Animator.rotate(112.5F, 0.0F, 0.0F), PartAnimation.Interpolators.SPLINE),
-            new AnimationKeyframe(0.5F, Animator.rotate(67.5F, 0.0F, 0.0F), PartAnimation.Interpolators.SPLINE)
+            new AnimationKeyframe(0.0F, Animator.rotate(67.5F, 0.0F, 0.0F), PartAnimation.Interpolations.SPLINE),
+            new AnimationKeyframe(0.125F, Animator.rotate(112.5F, 0.0F, 0.0F), PartAnimation.Interpolations.SPLINE),
+            new AnimationKeyframe(0.25F, Animator.rotate(67.5F, 0.0F, 0.0F), PartAnimation.Interpolations.SPLINE),
+            new AnimationKeyframe(0.375F, Animator.rotate(112.5F, 0.0F, 0.0F), PartAnimation.Interpolations.SPLINE),
+            new AnimationKeyframe(0.5F, Animator.rotate(67.5F, 0.0F, 0.0F), PartAnimation.Interpolations.SPLINE)
          )
       )
       .addPartAnimation(
          "head",
          new PartAnimation(
             PartAnimation.AnimationTargets.ROTATE,
-            new AnimationKeyframe(0.0F, Animator.rotate(10.0F, 0.0F, 0.0F), PartAnimation.Interpolators.SPLINE),
-            new AnimationKeyframe(0.125F, Animator.rotate(0.0F, 0.0F, 0.0F), PartAnimation.Interpolators.SPLINE),
-            new AnimationKeyframe(0.25F, Animator.rotate(10.0F, 0.0F, 0.0F), PartAnimation.Interpolators.SPLINE),
-            new AnimationKeyframe(0.375F, Animator.rotate(0.0F, 0.0F, 0.0F), PartAnimation.Interpolators.SPLINE),
-            new AnimationKeyframe(0.5F, Animator.rotate(10.0F, 0.0F, 0.0F), PartAnimation.Interpolators.SPLINE)
+            new AnimationKeyframe(0.0F, Animator.rotate(10.0F, 0.0F, 0.0F), PartAnimation.Interpolations.SPLINE),
+            new AnimationKeyframe(0.125F, Animator.rotate(0.0F, 0.0F, 0.0F), PartAnimation.Interpolations.SPLINE),
+            new AnimationKeyframe(0.25F, Animator.rotate(10.0F, 0.0F, 0.0F), PartAnimation.Interpolations.SPLINE),
+            new AnimationKeyframe(0.375F, Animator.rotate(0.0F, 0.0F, 0.0F), PartAnimation.Interpolations.SPLINE),
+            new AnimationKeyframe(0.5F, Animator.rotate(10.0F, 0.0F, 0.0F), PartAnimation.Interpolations.SPLINE)
          )
       )
       .addPartAnimation(
          "right_front_leg",
          new PartAnimation(
             PartAnimation.AnimationTargets.ROTATE,
-            new AnimationKeyframe(0.0F, Animator.rotate(44.97272F, 1.76749F, -1.76833F), PartAnimation.Interpolators.SPLINE),
-            new AnimationKeyframe(0.125F, Animator.rotate(-90.0F, 0.0F, 0.0F), PartAnimation.Interpolators.SPLINE),
-            new AnimationKeyframe(0.25F, Animator.rotate(44.97272F, 1.76749F, -1.76833F), PartAnimation.Interpolators.SPLINE),
-            new AnimationKeyframe(0.375F, Animator.rotate(-90.0F, 0.0F, 0.0F), PartAnimation.Interpolators.SPLINE),
-            new AnimationKeyframe(0.5F, Animator.rotate(44.97272F, 1.76749F, -1.76833F), PartAnimation.Interpolators.SPLINE)
+            new AnimationKeyframe(0.0F, Animator.rotate(44.97272F, 1.76749F, -1.76833F), PartAnimation.Interpolations.SPLINE),
+            new AnimationKeyframe(0.125F, Animator.rotate(-90.0F, 0.0F, 0.0F), PartAnimation.Interpolations.SPLINE),
+            new AnimationKeyframe(0.25F, Animator.rotate(44.97272F, 1.76749F, -1.76833F), PartAnimation.Interpolations.SPLINE),
+            new AnimationKeyframe(0.375F, Animator.rotate(-90.0F, 0.0F, 0.0F), PartAnimation.Interpolations.SPLINE),
+            new AnimationKeyframe(0.5F, Animator.rotate(44.97272F, 1.76749F, -1.76833F), PartAnimation.Interpolations.SPLINE)
          )
       )
       .addPartAnimation(
          "left_front_leg",
          new PartAnimation(
             PartAnimation.AnimationTargets.ROTATE,
-            new AnimationKeyframe(0.0F, Animator.rotate(-90.0F, 0.0F, 0.0F), PartAnimation.Interpolators.SPLINE),
-            new AnimationKeyframe(0.125F, Animator.rotate(44.97272F, -1.76749F, 1.76833F), PartAnimation.Interpolators.SPLINE),
-            new AnimationKeyframe(0.25F, Animator.rotate(-90.0F, 0.0F, 0.0F), PartAnimation.Interpolators.SPLINE),
-            new AnimationKeyframe(0.375F, Animator.rotate(44.97272F, -1.76749F, 1.76833F), PartAnimation.Interpolators.SPLINE),
-            new AnimationKeyframe(0.5F, Animator.rotate(-90.0F, 0.0F, 0.0F), PartAnimation.Interpolators.SPLINE)
+            new AnimationKeyframe(0.0F, Animator.rotate(-90.0F, 0.0F, 0.0F), PartAnimation.Interpolations.SPLINE),
+            new AnimationKeyframe(0.125F, Animator.rotate(44.97272F, -1.76749F, 1.76833F), PartAnimation.Interpolations.SPLINE),
+            new AnimationKeyframe(0.25F, Animator.rotate(-90.0F, 0.0F, 0.0F), PartAnimation.Interpolations.SPLINE),
+            new AnimationKeyframe(0.375F, Animator.rotate(44.97272F, -1.76749F, 1.76833F), PartAnimation.Interpolations.SPLINE),
+            new AnimationKeyframe(0.5F, Animator.rotate(-90.0F, 0.0F, 0.0F), PartAnimation.Interpolations.SPLINE)
          )
       )
       .addPartAnimation(
          "left_hind_leg",
          new PartAnimation(
             PartAnimation.AnimationTargets.ROTATE,
-            new AnimationKeyframe(0.0F, Animator.rotate(90.0F, 0.0F, 0.0F), PartAnimation.Interpolators.SPLINE),
-            new AnimationKeyframe(0.125F, Animator.rotate(-45.0F, 0.0F, 0.0F), PartAnimation.Interpolators.SPLINE),
-            new AnimationKeyframe(0.25F, Animator.rotate(90.0F, 0.0F, 0.0F), PartAnimation.Interpolators.SPLINE),
-            new AnimationKeyframe(0.375F, Animator.rotate(-45.0F, 0.0F, 0.0F), PartAnimation.Interpolators.SPLINE),
-            new AnimationKeyframe(0.5F, Animator.rotate(90.0F, 0.0F, 0.0F), PartAnimation.Interpolators.SPLINE)
+            new AnimationKeyframe(0.0F, Animator.rotate(90.0F, 0.0F, 0.0F), PartAnimation.Interpolations.SPLINE),
+            new AnimationKeyframe(0.125F, Animator.rotate(-45.0F, 0.0F, 0.0F), PartAnimation.Interpolations.SPLINE),
+            new AnimationKeyframe(0.25F, Animator.rotate(90.0F, 0.0F, 0.0F), PartAnimation.Interpolations.SPLINE),
+            new AnimationKeyframe(0.375F, Animator.rotate(-45.0F, 0.0F, 0.0F), PartAnimation.Interpolations.SPLINE),
+            new AnimationKeyframe(0.5F, Animator.rotate(90.0F, 0.0F, 0.0F), PartAnimation.Interpolations.SPLINE)
          )
       )
       .addPartAnimation(
          "right_hind_leg",
          new PartAnimation(
             PartAnimation.AnimationTargets.ROTATE,

The diff for this file is not complete!

The remaining diff is too long!

Please sign in to comment.