From ddb831ea5ea8201fae684a48b9e546cd3863f610 Mon Sep 17 00:00:00 2001 From: Cloak-Bot <57413759+Cloak-Bot@users.noreply.github.com> Date: Tue, 31 Dec 2019 00:16:03 +0200 Subject: [PATCH] Some Fluid Mappings (#1000) * Fluid#method_20784(class_3610) -> getHeight * FluidState#method_20785() -> getHeight * BaseFluid#method_15741(class_3610) -> getLevel * BaseFluid#getLevel(class_3610)[0 = ] -> state * BaseFluid#method_15738(class_1922 ,class_2338 ,class_2680 ,class_2350 ,class_2338 ,class_2680 ,class_3610 ,class_3611) -> canFlow * BaseFluid#method_15725(class_1936 ,class_2338 ,class_3610) -> tryFlow * BaseFluid#tryFlow(class_1936 ,class_2338 ,class_3610)[1 = world] -> flowTo * BaseFluid#canFlow(class_1922 ,class_2338 ,class_2680 ,class_2350 ,class_2338 ,class_2680 ,class_3610 ,class_3611)[1 = ] -> flowTo * BaseFluid#tryFlow(class_1936 ,class_2338 ,class_3610)[1 = flowTo] -> waterPos * BaseFluid#canFlow(class_1922 ,class_2338 ,class_2680 ,class_2350 ,class_2338 ,class_2680 ,class_3610 ,class_3611)[1 = flowTo] -> waterPos * FluidState#method_15756(2) -> isSeeableFromASide * FluidState#isSeeableFromASide(2) -> isSeeableFromASideClient * BaseFluid#canFlow(8)[2 = ] -> waterBlockState * FluidState#isSeeableFromASideClient(2) -> isVisibleFromASideClient * BaseFluid#canFlow(8)[1 = waterPos] -> fluidPos * BaseFluid#canFlow(8)[2 = waterBlockState] -> fluidBlockState * BaseFluid#tryFlow(3)[1 = waterPos] -> fluidPos * BaseFluid#canFlow(8)[3 = ] -> flowDirection * BaseFluid#canFlow(8)[0 = ] -> view * BaseFluid#canFlow(8)[4 = ] -> flowTo * BaseFluid#canFlow(8)[5 = ] -> flowToBlockState * BaseFluid#tryFlow(3)[1 = fluidPos] -> worldfix * BaseFluid#tryFlow(3)[1 = worldfix] -> world * BaseFluid#tryFlow(3)[2 = pos] -> fluidPos * BaseFluid#getLevel(1)[0 = state] -> stateFix * BaseFluid#getLevel(1)[0 = stateFix] -> state * BaseFluid#canFlow(8)[1 = fluidPos] -> blockViewFix * BaseFluid#canFlow(8)[2 = fluidBlockState] -> blockPosFix * BaseFluid#canFlow(8)[3 = flowDirection] -> blockStateFix * BaseFluid#canFlow(8)[4 = flowTo] -> directionFix * BaseFluid#canFlow(8)[5 = flowToBlockState] -> blockPos2Fix * BaseFluid#getUpdatedState(3)[1 = ] -> view * BaseFluid#getLevelDecreasePerBlock(1)[1 = ] -> view * FluidState#isVisibleFromASideClient(2) -> isVisibleFromASide * Update FluidState.mapping Co-authored-by: Fudge --- mappings/net/minecraft/fluid/BaseFluid.mapping | 13 +++++++++++-- mappings/net/minecraft/fluid/Fluid.mapping | 1 + mappings/net/minecraft/fluid/FluidState.mapping | 1 + 3 files changed, 13 insertions(+), 2 deletions(-) diff --git a/mappings/net/minecraft/fluid/BaseFluid.mapping b/mappings/net/minecraft/fluid/BaseFluid.mapping index 077e1317cf..54726aabc2 100644 --- a/mappings/net/minecraft/fluid/BaseFluid.mapping +++ b/mappings/net/minecraft/fluid/BaseFluid.mapping @@ -2,11 +2,12 @@ CLASS net/minecraft/class_3609 net/minecraft/fluid/BaseFluid FIELD field_15900 LEVEL Lnet/minecraft/class_2758; FIELD field_15902 FALLING Lnet/minecraft/class_2746; FIELD field_17587 shapeCache Ljava/util/Map; - METHOD method_15725 (Lnet/minecraft/class_1936;Lnet/minecraft/class_2338;Lnet/minecraft/class_3610;)V + METHOD method_15725 tryFlow (Lnet/minecraft/class_1936;Lnet/minecraft/class_2338;Lnet/minecraft/class_3610;)V ARG 1 world - ARG 2 pos + ARG 2 fluidPos ARG 3 state METHOD method_15727 getUpdatedState (Lnet/minecraft/class_4538;Lnet/minecraft/class_2338;Lnet/minecraft/class_2680;)Lnet/minecraft/class_3610; + ARG 1 view ARG 2 pos ARG 3 state METHOD method_15728 getFlowing (IZ)Lnet/minecraft/class_3610; @@ -27,6 +28,7 @@ CLASS net/minecraft/class_3609 net/minecraft/fluid/BaseFluid ARG 6 fromState METHOD method_15737 isInfinite ()Z METHOD method_15739 getLevelDecreasePerBlock (Lnet/minecraft/class_4538;)I + ARG 1 view METHOD method_15745 flow (Lnet/minecraft/class_1936;Lnet/minecraft/class_2338;Lnet/minecraft/class_2680;Lnet/minecraft/class_2350;Lnet/minecraft/class_3610;)V ARG 1 world ARG 2 pos @@ -43,3 +45,10 @@ CLASS net/minecraft/class_3609 net/minecraft/fluid/BaseFluid ARG 0 state ARG 1 view ARG 2 pos + METHOD method_15738 canFlow (Lnet/minecraft/class_1922;Lnet/minecraft/class_2338;Lnet/minecraft/class_2680;Lnet/minecraft/class_2350;Lnet/minecraft/class_2338;Lnet/minecraft/class_2680;Lnet/minecraft/class_3610;Lnet/minecraft/class_3611;)Z + ARG 1 view + ARG 2 fluidPos + ARG 3 fluidBlockState + ARG 4 flowDirection + ARG 5 flowTo + ARG 6 flowToBlockState diff --git a/mappings/net/minecraft/fluid/Fluid.mapping b/mappings/net/minecraft/fluid/Fluid.mapping index 84908d1a6e..6b43c7268f 100644 --- a/mappings/net/minecraft/fluid/Fluid.mapping +++ b/mappings/net/minecraft/fluid/Fluid.mapping @@ -29,3 +29,4 @@ CLASS net/minecraft/class_3611 net/minecraft/fluid/Fluid METHOD method_15794 isEmpty ()Z METHOD method_15795 hasRandomTicks ()Z METHOD method_17775 getShape (Lnet/minecraft/class_3610;Lnet/minecraft/class_1922;Lnet/minecraft/class_2338;)Lnet/minecraft/class_265; + METHOD method_20784 getHeight (Lnet/minecraft/class_3610;)F diff --git a/mappings/net/minecraft/fluid/FluidState.mapping b/mappings/net/minecraft/fluid/FluidState.mapping index 6cc97f705f..4504be1e68 100644 --- a/mappings/net/minecraft/fluid/FluidState.mapping +++ b/mappings/net/minecraft/fluid/FluidState.mapping @@ -32,3 +32,4 @@ CLASS net/minecraft/class_3610 net/minecraft/fluid/FluidState ARG 0 ops ARG 1 state METHOD method_17776 getShape (Lnet/minecraft/class_1922;Lnet/minecraft/class_2338;)Lnet/minecraft/class_265; + METHOD method_20785 getHeight ()F