From ed50e61b785e6314b97c58464f47aa29980089c4 Mon Sep 17 00:00:00 2001 From: Shnupbups Date: Mon, 25 Jan 2021 03:38:30 +1100 Subject: [PATCH] particle (#1973) --- .../client/particle/BarrierParticle.mapping | 1 + .../client/particle/BlockLeakParticle.mapping | 29 +++++++++++++++++++ .../DustColorTransitionParticle.mapping | 3 ++ .../client/particle/GlowParticle.mapping | 13 +++++++++ .../particle/ItemPickupParticle.mapping | 3 ++ .../client/particle/Particle.mapping | 1 + .../client/particle/RedDustParticle.mapping | 7 +++++ .../client/particle/SpellParticle.mapping | 9 ++++++ .../client/particle/SquidInkParticle.mapping | 2 +- .../client/particle/VibrationParticle.mapping | 5 ++++ .../particle/WaterBubbleParticle.mapping | 3 ++ 11 files changed, 75 insertions(+), 1 deletion(-) create mode 100644 mappings/net/minecraft/client/particle/GlowParticle.mapping diff --git a/mappings/net/minecraft/client/particle/BarrierParticle.mapping b/mappings/net/minecraft/client/particle/BarrierParticle.mapping index fade51b9f8..d0edddcedd 100644 --- a/mappings/net/minecraft/client/particle/BarrierParticle.mapping +++ b/mappings/net/minecraft/client/particle/BarrierParticle.mapping @@ -4,4 +4,5 @@ CLASS net/minecraft/class_651 net/minecraft/client/particle/BarrierParticle ARG 2 x ARG 4 y ARG 6 z + ARG 8 item CLASS class_652 Factory diff --git a/mappings/net/minecraft/client/particle/BlockLeakParticle.mapping b/mappings/net/minecraft/client/particle/BlockLeakParticle.mapping index 9e02fbcf9d..9fb00dfb91 100644 --- a/mappings/net/minecraft/client/particle/BlockLeakParticle.mapping +++ b/mappings/net/minecraft/client/particle/BlockLeakParticle.mapping @@ -9,6 +9,7 @@ CLASS net/minecraft/class_663 net/minecraft/client/particle/BlockLeakParticle ARG 8 fluid METHOD method_18821 updateAge ()V METHOD method_18822 updateVelocity ()V + METHOD method_32791 getFluid ()Lnet/minecraft/class_3611; CLASS class_664 DrippingLavaFactory FIELD field_18295 spriteProvider Lnet/minecraft/class_4002; METHOD (Lnet/minecraft/class_4002;)V @@ -19,6 +20,7 @@ CLASS net/minecraft/class_663 net/minecraft/client/particle/BlockLeakParticle ARG 1 spriteProvider CLASS class_4082 DrippingLava METHOD (Lnet/minecraft/class_638;DDDLnet/minecraft/class_3611;Lnet/minecraft/class_2394;)V + ARG 1 world ARG 2 x ARG 4 y ARG 6 z @@ -27,6 +29,7 @@ CLASS net/minecraft/class_663 net/minecraft/client/particle/BlockLeakParticle CLASS class_4083 ContinuousFalling FIELD field_18292 nextParticle Lnet/minecraft/class_2394; METHOD (Lnet/minecraft/class_638;DDDLnet/minecraft/class_3611;Lnet/minecraft/class_2394;)V + ARG 1 world ARG 2 x ARG 4 y ARG 6 z @@ -35,6 +38,7 @@ CLASS net/minecraft/class_663 net/minecraft/client/particle/BlockLeakParticle CLASS class_4084 Dripping FIELD field_18293 nextParticle Lnet/minecraft/class_2394; METHOD (Lnet/minecraft/class_638;DDDLnet/minecraft/class_3611;Lnet/minecraft/class_2394;)V + ARG 1 world ARG 2 x ARG 4 y ARG 6 z @@ -73,6 +77,7 @@ CLASS net/minecraft/class_663 net/minecraft/client/particle/BlockLeakParticle ARG 4 y ARG 6 z ARG 8 fluid + ARG 9 particleEffect CLASS class_4499 FallingHoneyFactory FIELD field_20515 spriteProvider Lnet/minecraft/class_4002; METHOD (Lnet/minecraft/class_4002;)V @@ -101,3 +106,27 @@ CLASS net/minecraft/class_663 net/minecraft/client/particle/BlockLeakParticle FIELD field_22440 spriteProvider Lnet/minecraft/class_4002; METHOD (Lnet/minecraft/class_4002;)V ARG 1 spriteProvider + CLASS class_5692 DripstoneLavaDrip + METHOD (Lnet/minecraft/class_638;DDDLnet/minecraft/class_3611;Lnet/minecraft/class_2394;)V + ARG 1 world + ARG 2 x + ARG 4 y + ARG 6 z + ARG 8 fluid + ARG 9 particleEffect + CLASS class_5693 LandingDripstoneLavaFactory + FIELD field_28071 spriteProvider Lnet/minecraft/class_4002; + METHOD (Lnet/minecraft/class_4002;)V + ARG 1 spriteProvider + CLASS class_5694 FallingDripstoneLavaFactory + FIELD field_28072 spriteProvider Lnet/minecraft/class_4002; + METHOD (Lnet/minecraft/class_4002;)V + ARG 1 spriteProvider + CLASS class_5695 DripstoneLavaSplashFactory + FIELD field_28073 spriteProvider Lnet/minecraft/class_4002; + METHOD (Lnet/minecraft/class_4002;)V + ARG 1 spriteProvider + CLASS class_5696 FallingDripstoneWaterFactory + FIELD field_28074 spriteProvider Lnet/minecraft/class_4002; + METHOD (Lnet/minecraft/class_4002;)V + ARG 1 spriteProvider diff --git a/mappings/net/minecraft/client/particle/DustColorTransitionParticle.mapping b/mappings/net/minecraft/client/particle/DustColorTransitionParticle.mapping index a73e14e16a..35963759e1 100644 --- a/mappings/net/minecraft/client/particle/DustColorTransitionParticle.mapping +++ b/mappings/net/minecraft/client/particle/DustColorTransitionParticle.mapping @@ -2,3 +2,6 @@ CLASS net/minecraft/class_5734 net/minecraft/client/particle/DustColorTransition METHOD (Lnet/minecraft/class_638;DDDDDDLnet/minecraft/class_5743;Lnet/minecraft/class_4002;)V ARG 1 world CLASS class_5735 Factory + FIELD field_28246 spriteProvider Lnet/minecraft/class_4002; + METHOD (Lnet/minecraft/class_4002;)V + ARG 1 spriteProvider diff --git a/mappings/net/minecraft/client/particle/GlowParticle.mapping b/mappings/net/minecraft/client/particle/GlowParticle.mapping new file mode 100644 index 0000000000..314776bb62 --- /dev/null +++ b/mappings/net/minecraft/client/particle/GlowParticle.mapping @@ -0,0 +1,13 @@ +CLASS net/minecraft/class_5786 net/minecraft/client/particle/GlowParticle + FIELD field_28457 RANDOM Ljava/util/Random; + FIELD field_28458 spriteProvider Lnet/minecraft/class_4002; + METHOD (Lnet/minecraft/class_638;DDDDDDLnet/minecraft/class_4002;)V + ARG 1 world + ARG 2 x + ARG 4 y + ARG 6 z + ARG 14 spriteProvider + CLASS class_5787 Factory + FIELD field_28459 spriteProvider Lnet/minecraft/class_4002; + METHOD (Lnet/minecraft/class_4002;)V + ARG 1 spriteProvider diff --git a/mappings/net/minecraft/client/particle/ItemPickupParticle.mapping b/mappings/net/minecraft/client/particle/ItemPickupParticle.mapping index 03185cc8aa..989e53e837 100644 --- a/mappings/net/minecraft/client/particle/ItemPickupParticle.mapping +++ b/mappings/net/minecraft/client/particle/ItemPickupParticle.mapping @@ -14,5 +14,8 @@ CLASS net/minecraft/class_693 net/minecraft/client/particle/ItemPickupParticle ARG 1 dispatcher ARG 2 bufferStorage ARG 3 world + ARG 4 itemEntity ARG 5 interactingEntity ARG 6 velocity + METHOD method_29358 getOrCopy (Lnet/minecraft/class_1297;)Lnet/minecraft/class_1297; + ARG 1 entity diff --git a/mappings/net/minecraft/client/particle/Particle.mapping b/mappings/net/minecraft/client/particle/Particle.mapping index 4d3c0f8852..4fb8066ea8 100644 --- a/mappings/net/minecraft/client/particle/Particle.mapping +++ b/mappings/net/minecraft/client/particle/Particle.mapping @@ -46,6 +46,7 @@ CLASS net/minecraft/class_703 net/minecraft/client/particle/Particle ARG 5 z METHOD method_3064 getBoundingBox ()Lnet/minecraft/class_238; METHOD method_3067 setBoundingBox (Lnet/minecraft/class_238;)V + ARG 1 boundingBox METHOD method_3068 getColorMultiplier (F)I ARG 1 tint METHOD method_3069 move (DDD)V diff --git a/mappings/net/minecraft/client/particle/RedDustParticle.mapping b/mappings/net/minecraft/client/particle/RedDustParticle.mapping index da17c67f94..e3402a7789 100644 --- a/mappings/net/minecraft/client/particle/RedDustParticle.mapping +++ b/mappings/net/minecraft/client/particle/RedDustParticle.mapping @@ -1,6 +1,13 @@ CLASS net/minecraft/class_671 net/minecraft/client/particle/RedDustParticle METHOD (Lnet/minecraft/class_638;DDDDDDLnet/minecraft/class_2390;Lnet/minecraft/class_4002;)V ARG 1 world + ARG 2 x + ARG 4 y + ARG 6 z + ARG 8 velocityX + ARG 10 velocityY + ARG 12 velocityZ + ARG 15 spriteProvider CLASS class_672 Factory FIELD field_17802 spriteProvider Lnet/minecraft/class_4002; METHOD (Lnet/minecraft/class_4002;)V diff --git a/mappings/net/minecraft/client/particle/SpellParticle.mapping b/mappings/net/minecraft/client/particle/SpellParticle.mapping index 18df54822d..4fe2398755 100644 --- a/mappings/net/minecraft/client/particle/SpellParticle.mapping +++ b/mappings/net/minecraft/client/particle/SpellParticle.mapping @@ -15,7 +15,16 @@ CLASS net/minecraft/class_711 net/minecraft/client/particle/SpellParticle METHOD (Lnet/minecraft/class_4002;)V ARG 1 spriteProvider CLASS class_713 InstantFactory + FIELD field_17872 spriteProvider Lnet/minecraft/class_4002; + METHOD (Lnet/minecraft/class_4002;)V + ARG 1 spriteProvider CLASS class_714 EntityFactory + FIELD field_17873 spriteProvider Lnet/minecraft/class_4002; + METHOD (Lnet/minecraft/class_4002;)V + ARG 1 spriteProvider CLASS class_715 DefaultFactory FIELD field_17874 spriteProvider Lnet/minecraft/class_4002; CLASS class_716 WitchFactory + FIELD field_17875 spriteProvider Lnet/minecraft/class_4002; + METHOD (Lnet/minecraft/class_4002;)V + ARG 1 spriteProvider diff --git a/mappings/net/minecraft/client/particle/SquidInkParticle.mapping b/mappings/net/minecraft/client/particle/SquidInkParticle.mapping index 45bb643e0d..800f5ed9f6 100644 --- a/mappings/net/minecraft/client/particle/SquidInkParticle.mapping +++ b/mappings/net/minecraft/client/particle/SquidInkParticle.mapping @@ -13,7 +13,7 @@ CLASS net/minecraft/class_725 net/minecraft/client/particle/SquidInkParticle FIELD field_17878 spriteProvider Lnet/minecraft/class_4002; METHOD (Lnet/minecraft/class_4002;)V ARG 1 spriteProvider - CLASS class_5788 GlowFactory + CLASS class_5788 GlowSquidInkFactory FIELD field_28460 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 eb768f80fa..b4410772e3 100644 --- a/mappings/net/minecraft/client/particle/VibrationParticle.mapping +++ b/mappings/net/minecraft/client/particle/VibrationParticle.mapping @@ -1,5 +1,10 @@ CLASS net/minecraft/class_5737 net/minecraft/client/particle/VibrationParticle + FIELD field_28249 vibration Lnet/minecraft/class_5720; METHOD (Lnet/minecraft/class_638;Lnet/minecraft/class_5720;I)V ARG 1 world + ARG 2 vibration ARG 3 maxAge CLASS class_5738 Factory + FIELD field_28251 spriteProvider Lnet/minecraft/class_4002; + METHOD (Lnet/minecraft/class_4002;)V + ARG 1 spriteProvider diff --git a/mappings/net/minecraft/client/particle/WaterBubbleParticle.mapping b/mappings/net/minecraft/client/particle/WaterBubbleParticle.mapping index c57559bc6c..e75669987f 100644 --- a/mappings/net/minecraft/client/particle/WaterBubbleParticle.mapping +++ b/mappings/net/minecraft/client/particle/WaterBubbleParticle.mapping @@ -4,6 +4,9 @@ CLASS net/minecraft/class_655 net/minecraft/client/particle/WaterBubbleParticle ARG 2 x ARG 4 y ARG 6 z + ARG 8 velocityX + ARG 10 velocityY + ARG 12 velocityZ CLASS class_656 Factory FIELD field_17785 spriteProvider Lnet/minecraft/class_4002; METHOD (Lnet/minecraft/class_4002;)V