From 0f28a95d2409db55656b63eefd4750d81a9a095f Mon Sep 17 00:00:00 2001 From: Levoment <30224138+Levoment@users.noreply.github.com> Date: Sat, 3 Sep 2022 03:55:45 -0500 Subject: [PATCH 1/7] Changed FlowableFluid getVelocity method name to getFlowDirectionVector. Changed the argument in the same method with name 'state' to 'mainFluidState'. Also added a documentation for the method. --- mappings/net/minecraft/fluid/FlowableFluid.mapping | 10 ++++++++++ mappings/net/minecraft/fluid/Fluid.mapping | 4 ++-- 2 files changed, 12 insertions(+), 2 deletions(-) diff --git a/mappings/net/minecraft/fluid/FlowableFluid.mapping b/mappings/net/minecraft/fluid/FlowableFluid.mapping index 447b740d21..47a279bdbe 100644 --- a/mappings/net/minecraft/fluid/FlowableFluid.mapping +++ b/mappings/net/minecraft/fluid/FlowableFluid.mapping @@ -98,6 +98,16 @@ CLASS net/minecraft/class_3609 net/minecraft/fluid/FlowableFluid ARG 2 pos ARG 3 state ARG 4 fluid + METHOD method_15782 (Lnet/minecraft/class_1922;Lnet/minecraft/class_2338;Lnet/minecraft/class_3610;)Lnet/minecraft/class_243; + COMMENT Gets a 3D vector indicating the direction the given fluid state will flow towards + COMMENT + COMMENT Example: a return of (0, 0, -1) means the given {@link FluidState} will flow towards negative-Z in the game which is towards the North. + COMMENT Likewise (0, 0, 1) means the given {@link FluidState} will flow towards positive-Z in the game which is South. + COMMENT + COMMENT @param world the world that will be queried for the fluid states around the fluid state whose direction of flow is desired + COMMENT @param pos the {@link BlockPos} containing the position of the fluid state whose direction of flow is desired + COMMENT @param mainFluidState the {@link FluidState} whose direction of flow is desired to be known + COMMENT @return a {@link Vec3D} vector indicating the direction the given {@link FluidState} should flow METHOD method_17774 isFluidAboveEqual (Lnet/minecraft/class_3610;Lnet/minecraft/class_1922;Lnet/minecraft/class_2338;)Z ARG 0 state ARG 1 world diff --git a/mappings/net/minecraft/fluid/Fluid.mapping b/mappings/net/minecraft/fluid/Fluid.mapping index 55752017e2..b79b3d14f6 100644 --- a/mappings/net/minecraft/fluid/Fluid.mapping +++ b/mappings/net/minecraft/fluid/Fluid.mapping @@ -27,10 +27,10 @@ CLASS net/minecraft/class_3611 net/minecraft/fluid/Fluid ARG 1 fluid METHOD method_15781 setDefaultState (Lnet/minecraft/class_3610;)V ARG 1 state - METHOD method_15782 getVelocity (Lnet/minecraft/class_1922;Lnet/minecraft/class_2338;Lnet/minecraft/class_3610;)Lnet/minecraft/class_243; + METHOD method_15782 getFlowDirectionVector (Lnet/minecraft/class_1922;Lnet/minecraft/class_2338;Lnet/minecraft/class_3610;)Lnet/minecraft/class_243; ARG 1 world ARG 2 pos - ARG 3 state + ARG 3 mainFluidState METHOD method_15783 getStateManager ()Lnet/minecraft/class_2689; METHOD method_15784 getBlastResistance ()F METHOD method_15785 getDefaultState ()Lnet/minecraft/class_3610; From 75da893d76df7a235dbc0d80924c743f7b895a34 Mon Sep 17 00:00:00 2001 From: Levoment <30224138+Levoment@users.noreply.github.com> Date: Sat, 3 Sep 2022 12:25:20 -0500 Subject: [PATCH 2/7] Changed FlowableFluid getVelocity method name to getFlowDirectionVector. Changed the argument in the same method with name 'state' to 'mainFluidState'. Also added a documentation for the method. --- mappings/net/minecraft/fluid/FlowableFluid.mapping | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/mappings/net/minecraft/fluid/FlowableFluid.mapping b/mappings/net/minecraft/fluid/FlowableFluid.mapping index 47a279bdbe..3360a031ce 100644 --- a/mappings/net/minecraft/fluid/FlowableFluid.mapping +++ b/mappings/net/minecraft/fluid/FlowableFluid.mapping @@ -104,10 +104,10 @@ CLASS net/minecraft/class_3609 net/minecraft/fluid/FlowableFluid COMMENT Example: a return of (0, 0, -1) means the given {@link FluidState} will flow towards negative-Z in the game which is towards the North. COMMENT Likewise (0, 0, 1) means the given {@link FluidState} will flow towards positive-Z in the game which is South. COMMENT - COMMENT @param world the world that will be queried for the fluid states around the fluid state whose direction of flow is desired - COMMENT @param pos the {@link BlockPos} containing the position of the fluid state whose direction of flow is desired - COMMENT @param mainFluidState the {@link FluidState} whose direction of flow is desired to be known - COMMENT @return a {@link Vec3D} vector indicating the direction the given {@link FluidState} should flow + COMMENT {@param world} the world that will be queried for the fluid states around the fluid state whose direction of flow is desired + COMMENT {@param pos} the {@link BlockPos} containing the position of the fluid state whose direction of flow is desired + COMMENT {@param mainFluidState} the {@link FluidState} whose direction of flow is desired to be known + COMMENT @return vector a {@link Vec3D} indicating the direction the given {@link FluidState} should flow METHOD method_17774 isFluidAboveEqual (Lnet/minecraft/class_3610;Lnet/minecraft/class_1922;Lnet/minecraft/class_2338;)Z ARG 0 state ARG 1 world From 5076644a8c3933dec14c80c9f6b0da20b352fffc Mon Sep 17 00:00:00 2001 From: Levoment <30224138+Levoment@users.noreply.github.com> Date: Sat, 3 Sep 2022 13:00:51 -0500 Subject: [PATCH 3/7] Changed FlowableFluid getVelocity method name back to normal. Changed the FluidState getVelocity to getFlowDirectionVector which will cascade to overriding classes. Changed the argument in the same method with name 'mainFluidState' back to 'state'. Also moved documentation for the method to the Fluid class. This allows the documentation to cascade to overriding methods. --- mappings/net/minecraft/fluid/FlowableFluid.mapping | 9 --------- mappings/net/minecraft/fluid/Fluid.mapping | 10 +++++++++- mappings/net/minecraft/fluid/FluidState.mapping | 2 +- 3 files changed, 10 insertions(+), 11 deletions(-) diff --git a/mappings/net/minecraft/fluid/FlowableFluid.mapping b/mappings/net/minecraft/fluid/FlowableFluid.mapping index 3360a031ce..35b4d135fa 100644 --- a/mappings/net/minecraft/fluid/FlowableFluid.mapping +++ b/mappings/net/minecraft/fluid/FlowableFluid.mapping @@ -99,15 +99,6 @@ CLASS net/minecraft/class_3609 net/minecraft/fluid/FlowableFluid ARG 3 state ARG 4 fluid METHOD method_15782 (Lnet/minecraft/class_1922;Lnet/minecraft/class_2338;Lnet/minecraft/class_3610;)Lnet/minecraft/class_243; - COMMENT Gets a 3D vector indicating the direction the given fluid state will flow towards - COMMENT - COMMENT Example: a return of (0, 0, -1) means the given {@link FluidState} will flow towards negative-Z in the game which is towards the North. - COMMENT Likewise (0, 0, 1) means the given {@link FluidState} will flow towards positive-Z in the game which is South. - COMMENT - COMMENT {@param world} the world that will be queried for the fluid states around the fluid state whose direction of flow is desired - COMMENT {@param pos} the {@link BlockPos} containing the position of the fluid state whose direction of flow is desired - COMMENT {@param mainFluidState} the {@link FluidState} whose direction of flow is desired to be known - COMMENT @return vector a {@link Vec3D} indicating the direction the given {@link FluidState} should flow METHOD method_17774 isFluidAboveEqual (Lnet/minecraft/class_3610;Lnet/minecraft/class_1922;Lnet/minecraft/class_2338;)Z ARG 0 state ARG 1 world diff --git a/mappings/net/minecraft/fluid/Fluid.mapping b/mappings/net/minecraft/fluid/Fluid.mapping index b79b3d14f6..78a49e2adc 100644 --- a/mappings/net/minecraft/fluid/Fluid.mapping +++ b/mappings/net/minecraft/fluid/Fluid.mapping @@ -28,9 +28,17 @@ CLASS net/minecraft/class_3611 net/minecraft/fluid/Fluid METHOD method_15781 setDefaultState (Lnet/minecraft/class_3610;)V ARG 1 state METHOD method_15782 getFlowDirectionVector (Lnet/minecraft/class_1922;Lnet/minecraft/class_2338;Lnet/minecraft/class_3610;)Lnet/minecraft/class_243; + COMMENT Gets a 3D vector indicating the direction the given fluid state will flow towards + COMMENT + COMMENT Example: a return of (0, 0, -1) means the given {@link FluidState} will flow towards negative-Z in the game which is towards the North. + COMMENT Likewise (0, 0, 1) means the given {@link FluidState} will flow towards positive-Z in the game which is South. + COMMENT @return vector a {@link Vec3D} indicating the direction the given {@link FluidState} should flow ARG 1 world + COMMENT the world that will be queried for the fluid states around the fluid state whose direction of flow is desired ARG 2 pos - ARG 3 mainFluidState + COMMENT the {@link BlockPos} containing the position of the fluid state whose direction of flow is desired + ARG 3 state + COMMENT the {@link FluidState} whose direction of flow is desired to be known METHOD method_15783 getStateManager ()Lnet/minecraft/class_2689; METHOD method_15784 getBlastResistance ()F METHOD method_15785 getDefaultState ()Lnet/minecraft/class_3610; diff --git a/mappings/net/minecraft/fluid/FluidState.mapping b/mappings/net/minecraft/fluid/FluidState.mapping index 3a44052f97..c608401275 100644 --- a/mappings/net/minecraft/fluid/FluidState.mapping +++ b/mappings/net/minecraft/fluid/FluidState.mapping @@ -11,7 +11,7 @@ CLASS net/minecraft/class_3610 net/minecraft/fluid/FluidState ARG 1 world ARG 2 pos ARG 3 random - METHOD method_15758 getVelocity (Lnet/minecraft/class_1922;Lnet/minecraft/class_2338;)Lnet/minecraft/class_243; + METHOD method_15758 getFlowDirectionVector (Lnet/minecraft/class_1922;Lnet/minecraft/class_2338;)Lnet/minecraft/class_243; ARG 1 world ARG 2 pos METHOD method_15759 getBlockState ()Lnet/minecraft/class_2680; From 9d33d69b66d405330c170a720fa9cd577dca50e3 Mon Sep 17 00:00:00 2001 From: Levoment <30224138+Levoment@users.noreply.github.com> Date: Sat, 3 Sep 2022 21:45:23 -0500 Subject: [PATCH 4/7] Update mappings/net/minecraft/fluid/FlowableFluid.mapping Co-authored-by: enbrain <69905075+enbrain@users.noreply.github.com> --- mappings/net/minecraft/fluid/FlowableFluid.mapping | 1 - 1 file changed, 1 deletion(-) diff --git a/mappings/net/minecraft/fluid/FlowableFluid.mapping b/mappings/net/minecraft/fluid/FlowableFluid.mapping index 35b4d135fa..447b740d21 100644 --- a/mappings/net/minecraft/fluid/FlowableFluid.mapping +++ b/mappings/net/minecraft/fluid/FlowableFluid.mapping @@ -98,7 +98,6 @@ CLASS net/minecraft/class_3609 net/minecraft/fluid/FlowableFluid ARG 2 pos ARG 3 state ARG 4 fluid - METHOD method_15782 (Lnet/minecraft/class_1922;Lnet/minecraft/class_2338;Lnet/minecraft/class_3610;)Lnet/minecraft/class_243; METHOD method_17774 isFluidAboveEqual (Lnet/minecraft/class_3610;Lnet/minecraft/class_1922;Lnet/minecraft/class_2338;)Z ARG 0 state ARG 1 world From eb70174a0fa08cbe0fc7fbfe465cadc00796277a Mon Sep 17 00:00:00 2001 From: Levoment <30224138+Levoment@users.noreply.github.com> Date: Sat, 3 Sep 2022 21:46:43 -0500 Subject: [PATCH 5/7] Update mappings/net/minecraft/fluid/Fluid.mapping Co-authored-by: enbrain <69905075+enbrain@users.noreply.github.com> --- mappings/net/minecraft/fluid/Fluid.mapping | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mappings/net/minecraft/fluid/Fluid.mapping b/mappings/net/minecraft/fluid/Fluid.mapping index 78a49e2adc..55fb41e647 100644 --- a/mappings/net/minecraft/fluid/Fluid.mapping +++ b/mappings/net/minecraft/fluid/Fluid.mapping @@ -28,7 +28,7 @@ CLASS net/minecraft/class_3611 net/minecraft/fluid/Fluid METHOD method_15781 setDefaultState (Lnet/minecraft/class_3610;)V ARG 1 state METHOD method_15782 getFlowDirectionVector (Lnet/minecraft/class_1922;Lnet/minecraft/class_2338;Lnet/minecraft/class_3610;)Lnet/minecraft/class_243; - COMMENT Gets a 3D vector indicating the direction the given fluid state will flow towards + COMMENT {@return a 3D vector indicating the direction the given fluid state will flow towards} COMMENT COMMENT Example: a return of (0, 0, -1) means the given {@link FluidState} will flow towards negative-Z in the game which is towards the North. COMMENT Likewise (0, 0, 1) means the given {@link FluidState} will flow towards positive-Z in the game which is South. From 280f95b049963c97dfbaa92915d2b610dbe1c587 Mon Sep 17 00:00:00 2001 From: Levoment <30224138+Levoment@users.noreply.github.com> Date: Sat, 3 Sep 2022 21:47:10 -0500 Subject: [PATCH 6/7] Update mappings/net/minecraft/fluid/Fluid.mapping Co-authored-by: enbrain <69905075+enbrain@users.noreply.github.com> --- mappings/net/minecraft/fluid/Fluid.mapping | 1 - 1 file changed, 1 deletion(-) diff --git a/mappings/net/minecraft/fluid/Fluid.mapping b/mappings/net/minecraft/fluid/Fluid.mapping index 55fb41e647..3aba65213a 100644 --- a/mappings/net/minecraft/fluid/Fluid.mapping +++ b/mappings/net/minecraft/fluid/Fluid.mapping @@ -32,7 +32,6 @@ CLASS net/minecraft/class_3611 net/minecraft/fluid/Fluid COMMENT COMMENT Example: a return of (0, 0, -1) means the given {@link FluidState} will flow towards negative-Z in the game which is towards the North. COMMENT Likewise (0, 0, 1) means the given {@link FluidState} will flow towards positive-Z in the game which is South. - COMMENT @return vector a {@link Vec3D} indicating the direction the given {@link FluidState} should flow ARG 1 world COMMENT the world that will be queried for the fluid states around the fluid state whose direction of flow is desired ARG 2 pos From 3f15943bd0bb2a34cf0b7249eb663ed0b0378411 Mon Sep 17 00:00:00 2001 From: Levoment <30224138+Levoment@users.noreply.github.com> Date: Sat, 3 Sep 2022 21:47:19 -0500 Subject: [PATCH 7/7] Update mappings/net/minecraft/fluid/Fluid.mapping Co-authored-by: enbrain <69905075+enbrain@users.noreply.github.com> --- mappings/net/minecraft/fluid/Fluid.mapping | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/mappings/net/minecraft/fluid/Fluid.mapping b/mappings/net/minecraft/fluid/Fluid.mapping index 3aba65213a..e8295585a6 100644 --- a/mappings/net/minecraft/fluid/Fluid.mapping +++ b/mappings/net/minecraft/fluid/Fluid.mapping @@ -30,8 +30,8 @@ CLASS net/minecraft/class_3611 net/minecraft/fluid/Fluid METHOD method_15782 getFlowDirectionVector (Lnet/minecraft/class_1922;Lnet/minecraft/class_2338;Lnet/minecraft/class_3610;)Lnet/minecraft/class_243; COMMENT {@return a 3D vector indicating the direction the given fluid state will flow towards} COMMENT - COMMENT Example: a return of (0, 0, -1) means the given {@link FluidState} will flow towards negative-Z in the game which is towards the North. - COMMENT Likewise (0, 0, 1) means the given {@link FluidState} will flow towards positive-Z in the game which is South. + COMMENT

Example: a return of {@code (0, 0, -1)} means the given {@link FluidState} will flow towards negative-Z in the game which is towards the North. + COMMENT Likewise {@code (0, 0, 1)} means the given {@link FluidState} will flow towards positive-Z in the game which is South. ARG 1 world COMMENT the world that will be queried for the fluid states around the fluid state whose direction of flow is desired ARG 2 pos