From eba1d0a9e9d2d117d25905d6ff02d2b0a5c9ba24 Mon Sep 17 00:00:00 2001 From: YanisBft Date: Tue, 18 Oct 2022 09:52:12 +0200 Subject: [PATCH] Map some particles and sounds constants (#3320) --- .../client/gui/tooltip/BundleTooltipComponent.mapping | 3 +++ .../minecraft/client/network/ClientPlayerEntity.mapping | 1 + .../client/particle/DragonBreathParticle.mapping | 8 ++++++++ .../net/minecraft/client/particle/GlowParticle.mapping | 4 ++++ .../minecraft/client/particle/VibrationParticle.mapping | 5 +++++ .../minecraft/client/particle/WhiteAshParticle.mapping | 1 + .../minecraft/client/sound/AbstractSoundInstance.mapping | 2 ++ .../net/minecraft/client/sound/AmbientSoundLoops.mapping | 1 + .../net/minecraft/client/sound/AmbientSoundPlayer.mapping | 4 ++++ .../minecraft/client/sound/BiomeEffectSoundPlayer.mapping | 1 + .../client/sound/GuardianAttackSoundInstance.mapping | 4 ++++ mappings/net/minecraft/client/sound/MusicTracker.mapping | 1 + mappings/net/minecraft/client/sound/SoundSystem.mapping | 5 +++++ 13 files changed, 40 insertions(+) diff --git a/mappings/net/minecraft/client/gui/tooltip/BundleTooltipComponent.mapping b/mappings/net/minecraft/client/gui/tooltip/BundleTooltipComponent.mapping index 0c5c7bcbaa..abbe8bf944 100644 --- a/mappings/net/minecraft/client/gui/tooltip/BundleTooltipComponent.mapping +++ b/mappings/net/minecraft/client/gui/tooltip/BundleTooltipComponent.mapping @@ -2,6 +2,9 @@ CLASS net/minecraft/class_5682 net/minecraft/client/gui/tooltip/BundleTooltipCom FIELD field_27995 inventory Lnet/minecraft/class_2371; FIELD field_28359 TEXTURE Lnet/minecraft/class_2960; FIELD field_28360 occupancy I + FIELD field_32383 TEXTURE_SIZE I + FIELD field_32384 WIDTH_PER_COLUMN I + FIELD field_32385 HEIGHT_PER_ROW I METHOD (Lnet/minecraft/class_5631;)V ARG 1 data METHOD method_33286 drawOutline (IIIILnet/minecraft/class_4587;I)V diff --git a/mappings/net/minecraft/client/network/ClientPlayerEntity.mapping b/mappings/net/minecraft/client/network/ClientPlayerEntity.mapping index efcd29c903..bacb28937f 100644 --- a/mappings/net/minecraft/client/network/ClientPlayerEntity.mapping +++ b/mappings/net/minecraft/client/network/ClientPlayerEntity.mapping @@ -3,6 +3,7 @@ CLASS net/minecraft/class_746 net/minecraft/client/network/ClientPlayerEntity FIELD field_20663 showsDeathScreen Z FIELD field_23093 inSneakingPose Z FIELD field_36194 MAX_SOFT_COLLISION_RADIANS D + FIELD field_39078 LOGGER Lorg/slf4j/Logger; FIELD field_3911 lastNauseaStrength F FIELD field_3912 clientPermissionLevel I FIELD field_3913 input Lnet/minecraft/class_744; diff --git a/mappings/net/minecraft/client/particle/DragonBreathParticle.mapping b/mappings/net/minecraft/client/particle/DragonBreathParticle.mapping index f46216cf6f..86f9cc7965 100644 --- a/mappings/net/minecraft/client/particle/DragonBreathParticle.mapping +++ b/mappings/net/minecraft/client/particle/DragonBreathParticle.mapping @@ -1,5 +1,13 @@ CLASS net/minecraft/class_666 net/minecraft/client/particle/DragonBreathParticle FIELD field_17793 spriteProvider Lnet/minecraft/class_4002; + FIELD field_32648 MIN_RED F + FIELD field_32649 MIN_GREEN F + FIELD field_32650 MIN_BLUE F + FIELD field_32651 MAX_RED F + FIELD field_32652 MAX_GREEN F + FIELD field_32653 MAX_BLUE F + FIELD field_32654 MIN_COLOR I + FIELD field_32655 MAX_COLOR I FIELD field_3792 reachedGround Z METHOD (Lnet/minecraft/class_638;DDDDDDLnet/minecraft/class_4002;)V ARG 1 world diff --git a/mappings/net/minecraft/client/particle/GlowParticle.mapping b/mappings/net/minecraft/client/particle/GlowParticle.mapping index fa0a8ff2b1..3d9038473c 100644 --- a/mappings/net/minecraft/client/particle/GlowParticle.mapping +++ b/mappings/net/minecraft/client/particle/GlowParticle.mapping @@ -11,6 +11,7 @@ CLASS net/minecraft/class_5786 net/minecraft/client/particle/GlowParticle ARG 12 velocityZ ARG 14 spriteProvider CLASS class_5956 ElectricSparkFactory + FIELD field_29570 velocityMultiplier D FIELD field_29571 spriteProvider Lnet/minecraft/class_4002; METHOD (Lnet/minecraft/class_4002;)V ARG 1 spriteProvider @@ -19,14 +20,17 @@ CLASS net/minecraft/class_5786 net/minecraft/client/particle/GlowParticle METHOD (Lnet/minecraft/class_4002;)V ARG 1 spriteProvider CLASS class_5958 ScrapeFactory + FIELD field_29573 velocityMultiplier D FIELD field_29574 spriteProvider Lnet/minecraft/class_4002; METHOD (Lnet/minecraft/class_4002;)V ARG 1 spriteProvider CLASS class_5959 WaxOffFactory + FIELD field_29575 velocityMultiplier D FIELD field_29576 spriteProvider Lnet/minecraft/class_4002; METHOD (Lnet/minecraft/class_4002;)V ARG 1 spriteProvider CLASS class_5960 WaxOnFactory + FIELD field_29577 velocityMultiplier D FIELD field_29578 spriteProvider Lnet/minecraft/class_4002; METHOD (Lnet/minecraft/class_4002;)V ARG 1 spriteProvider diff --git a/mappings/net/minecraft/client/particle/VibrationParticle.mapping b/mappings/net/minecraft/client/particle/VibrationParticle.mapping index b7dbb8f74c..94995bb7e6 100644 --- a/mappings/net/minecraft/client/particle/VibrationParticle.mapping +++ b/mappings/net/minecraft/client/particle/VibrationParticle.mapping @@ -2,6 +2,11 @@ CLASS net/minecraft/class_5737 net/minecraft/client/particle/VibrationParticle FIELD field_28249 vibration Lnet/minecraft/class_5716; METHOD (Lnet/minecraft/class_638;DDDLnet/minecraft/class_5716;I)V ARG 1 world + ARG 2 x + ARG 4 y + ARG 6 z + ARG 8 vibration + ARG 9 maxAge METHOD method_33077 (FFLnet/minecraft/class_1158;)V ARG 2 quaternion METHOD method_33078 render (Lnet/minecraft/class_4588;Lnet/minecraft/class_4184;FLjava/util/function/Consumer;)V diff --git a/mappings/net/minecraft/client/particle/WhiteAshParticle.mapping b/mappings/net/minecraft/client/particle/WhiteAshParticle.mapping index 7646ddb9e6..89c34f7c1f 100644 --- a/mappings/net/minecraft/client/particle/WhiteAshParticle.mapping +++ b/mappings/net/minecraft/client/particle/WhiteAshParticle.mapping @@ -1,4 +1,5 @@ CLASS net/minecraft/class_5165 net/minecraft/client/particle/WhiteAshParticle + FIELD field_32658 COLOR I METHOD (Lnet/minecraft/class_638;DDDDDDFLnet/minecraft/class_4002;)V ARG 1 world ARG 2 x diff --git a/mappings/net/minecraft/client/sound/AbstractSoundInstance.mapping b/mappings/net/minecraft/client/sound/AbstractSoundInstance.mapping index d7ba8992ff..5905a17ace 100644 --- a/mappings/net/minecraft/client/sound/AbstractSoundInstance.mapping +++ b/mappings/net/minecraft/client/sound/AbstractSoundInstance.mapping @@ -1,5 +1,6 @@ CLASS net/minecraft/class_1102 net/minecraft/client/sound/AbstractSoundInstance FIELD field_18936 relative Z + FIELD field_38800 random Lnet/minecraft/class_5819; FIELD field_5439 x D FIELD field_5440 attenuationType Lnet/minecraft/class_1113$class_1114; FIELD field_5441 pitch F @@ -14,6 +15,7 @@ CLASS net/minecraft/class_1102 net/minecraft/client/sound/AbstractSoundInstance METHOD (Lnet/minecraft/class_2960;Lnet/minecraft/class_3419;Lnet/minecraft/class_5819;)V ARG 1 soundId ARG 2 category + ARG 3 random METHOD (Lnet/minecraft/class_3414;Lnet/minecraft/class_3419;Lnet/minecraft/class_5819;)V ARG 1 sound ARG 2 category diff --git a/mappings/net/minecraft/client/sound/AmbientSoundLoops.mapping b/mappings/net/minecraft/client/sound/AmbientSoundLoops.mapping index 2af59a69aa..efabb5be9d 100644 --- a/mappings/net/minecraft/client/sound/AmbientSoundLoops.mapping +++ b/mappings/net/minecraft/client/sound/AmbientSoundLoops.mapping @@ -5,6 +5,7 @@ CLASS net/minecraft/class_1118 net/minecraft/client/sound/AmbientSoundLoops ARG 1 player ARG 2 soundEvent CLASS class_1120 Underwater + FIELD field_33012 MAX_TRANSITION_TIMER I FIELD field_5483 player Lnet/minecraft/class_746; FIELD field_5484 transitionTimer I METHOD (Lnet/minecraft/class_746;)V diff --git a/mappings/net/minecraft/client/sound/AmbientSoundPlayer.mapping b/mappings/net/minecraft/client/sound/AmbientSoundPlayer.mapping index bf559e65af..c5b6ab377b 100644 --- a/mappings/net/minecraft/client/sound/AmbientSoundPlayer.mapping +++ b/mappings/net/minecraft/client/sound/AmbientSoundPlayer.mapping @@ -1,4 +1,8 @@ CLASS net/minecraft/class_1116 net/minecraft/client/sound/AmbientSoundPlayer + FIELD field_33008 MAX_TICKS_FOR_BASE_SOUND_LOOP F + FIELD field_33009 MAX_TICKS_FOR_RARE_SOUND_LOOP F + FIELD field_33010 MAX_TICKS_FOR_ULTRA_RARE_SOUND_LOOP F + FIELD field_33011 DEFAULT_TICKS_UNTIL_PLAY I FIELD field_5479 soundManager Lnet/minecraft/class_1144; FIELD field_5480 ticksUntilPlay I FIELD field_5481 player Lnet/minecraft/class_746; diff --git a/mappings/net/minecraft/client/sound/BiomeEffectSoundPlayer.mapping b/mappings/net/minecraft/client/sound/BiomeEffectSoundPlayer.mapping index 85a4f85170..23e0adb0f7 100644 --- a/mappings/net/minecraft/client/sound/BiomeEffectSoundPlayer.mapping +++ b/mappings/net/minecraft/client/sound/BiomeEffectSoundPlayer.mapping @@ -8,6 +8,7 @@ CLASS net/minecraft/class_4897 net/minecraft/client/sound/BiomeEffectSoundPlayer FIELD field_22802 additionsSound Ljava/util/Optional; FIELD field_22804 activeBiome Lnet/minecraft/class_1959; FIELD field_23189 moodPercentage F + FIELD field_32994 MAX_STRENGTH I METHOD (Lnet/minecraft/class_746;Lnet/minecraft/class_1144;Lnet/minecraft/class_4543;)V ARG 1 player ARG 2 soundManager diff --git a/mappings/net/minecraft/client/sound/GuardianAttackSoundInstance.mapping b/mappings/net/minecraft/client/sound/GuardianAttackSoundInstance.mapping index 83cf9a8272..0c27c7c0aa 100644 --- a/mappings/net/minecraft/client/sound/GuardianAttackSoundInstance.mapping +++ b/mappings/net/minecraft/client/sound/GuardianAttackSoundInstance.mapping @@ -1,4 +1,8 @@ CLASS net/minecraft/class_1105 net/minecraft/client/sound/GuardianAttackSoundInstance + FIELD field_32997 BASE_VOLUME F + FIELD field_32998 BEAM_PROGRESS_VOLUME_MULTIPLIER F + FIELD field_32999 BASE_PITCH F + FIELD field_33000 BEAM_PROGRESS_PITCH_MULTIPLIER F FIELD field_5454 guardian Lnet/minecraft/class_1577; METHOD (Lnet/minecraft/class_1577;)V ARG 1 guardian diff --git a/mappings/net/minecraft/client/sound/MusicTracker.mapping b/mappings/net/minecraft/client/sound/MusicTracker.mapping index c58f9af227..f883082d37 100644 --- a/mappings/net/minecraft/client/sound/MusicTracker.mapping +++ b/mappings/net/minecraft/client/sound/MusicTracker.mapping @@ -1,4 +1,5 @@ CLASS net/minecraft/class_1142 net/minecraft/client/sound/MusicTracker + FIELD field_33019 DEFAULT_TIME_UNTIL_NEXT_SONG I FIELD field_5571 random Lnet/minecraft/class_5819; FIELD field_5572 timeUntilNextSong I FIELD field_5574 current Lnet/minecraft/class_1113; diff --git a/mappings/net/minecraft/client/sound/SoundSystem.mapping b/mappings/net/minecraft/client/sound/SoundSystem.mapping index 1aa41cfaaf..813c4fd7ec 100644 --- a/mappings/net/minecraft/client/sound/SoundSystem.mapping +++ b/mappings/net/minecraft/client/sound/SoundSystem.mapping @@ -9,8 +9,13 @@ CLASS net/minecraft/class_1140 net/minecraft/client/sound/SoundSystem FIELD field_18952 soundEndTicks Ljava/util/Map; FIELD field_20532 soundsToPlayNextTick Ljava/util/List; FIELD field_33020 FOR_THE_DEBUG Ljava/lang/String; + FIELD field_33021 MIN_PITCH F + FIELD field_33022 MAX_PITCH F + FIELD field_33023 MIN_VOLUME F + FIELD field_33024 MAX_VOLUME F FIELD field_34827 OPENAL_SOFT_ON Ljava/lang/String; FIELD field_34828 OPENAL_SOFT_ON_LENGTH I + FIELD field_34966 MIN_TIME_INTERVAL_TO_RELOAD_SOUNDS J FIELD field_34967 lastSoundDeviceCheckTime J FIELD field_35083 deviceChangeStatus Ljava/util/concurrent/atomic/AtomicReference; FIELD field_5550 ticks I