From 58d38fa9440ac7dd7cd74515510298dff0f5e291 Mon Sep 17 00:00:00 2001 From: LambdAurora Date: Sun, 9 Feb 2020 00:36:30 +0100 Subject: [PATCH] Add fluid mappings and fix some inconsistencies and typo. (#1095) * Fix some inconsistencies and misspelling. * Fix and add a lot of fluid mappings. * Change method_15819 to canLightFire. * Fix a typo in method Fluid#canBeReplacedWith. --- .../entity/passive/IronGolemEntity.mapping | 2 +- .../net/minecraft/fluid/BaseFluid.mapping | 55 +++++++++++++++++-- mappings/net/minecraft/fluid/Fluid.mapping | 27 +++++++++ .../net/minecraft/fluid/FluidState.mapping | 9 ++- .../net/minecraft/fluid/LavaFluid.mapping | 9 +++ 5 files changed, 96 insertions(+), 6 deletions(-) diff --git a/mappings/net/minecraft/entity/passive/IronGolemEntity.mapping b/mappings/net/minecraft/entity/passive/IronGolemEntity.mapping index 5eadf903fe..66388d7196 100644 --- a/mappings/net/minecraft/entity/passive/IronGolemEntity.mapping +++ b/mappings/net/minecraft/entity/passive/IronGolemEntity.mapping @@ -8,7 +8,7 @@ CLASS net/minecraft/class_1439 net/minecraft/entity/passive/IronGolemEntity METHOD method_6497 setLookingAtVillager (Z)V ARG 1 lookingAtVillager METHOD method_6499 setPlayerCreated (Z)V - ARG 1 playerCrated + ARG 1 playerCreated METHOD method_6501 getAttackTicksLeft ()I METHOD method_6502 getLookingAtVillagerTicks ()I CLASS class_4621 Crack diff --git a/mappings/net/minecraft/fluid/BaseFluid.mapping b/mappings/net/minecraft/fluid/BaseFluid.mapping index 7db92eed2b..3480d9ff44 100644 --- a/mappings/net/minecraft/fluid/BaseFluid.mapping +++ b/mappings/net/minecraft/fluid/BaseFluid.mapping @@ -6,8 +6,12 @@ CLASS net/minecraft/class_3609 net/minecraft/fluid/BaseFluid ARG 1 world ARG 2 fluidPos ARG 3 state + METHOD method_15726 getSpread (Lnet/minecraft/class_4538;Lnet/minecraft/class_2338;Lnet/minecraft/class_2680;)Ljava/util/Map; + ARG 1 world + ARG 2 pos + 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 1 world ARG 2 pos ARG 3 state METHOD method_15728 getFlowing (IZ)Lnet/minecraft/class_3610; @@ -26,29 +30,72 @@ CLASS net/minecraft/class_3609 net/minecraft/fluid/BaseFluid ARG 4 state ARG 5 fromPos ARG 6 fromState + METHOD method_15733 (Lnet/minecraft/class_4538;)I + ARG 1 world + METHOD method_15736 (Lnet/minecraft/class_1922;Lnet/minecraft/class_3611;Lnet/minecraft/class_2338;Lnet/minecraft/class_2680;Lnet/minecraft/class_2338;Lnet/minecraft/class_2680;)Z + ARG 1 world + ARG 2 fluid + ARG 3 pos + ARG 4 state + ARG 5 fromPos + ARG 6 fromState METHOD method_15737 isInfinite ()Z 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 1 world ARG 2 fluidPos ARG 3 fluidBlockState ARG 4 flowDirection ARG 5 flowTo ARG 6 flowToBlockState METHOD method_15739 getLevelDecreasePerBlock (Lnet/minecraft/class_4538;)I - ARG 1 view + ARG 1 world + METHOD method_15740 (Lnet/minecraft/class_4538;Lnet/minecraft/class_2338;)I + ARG 1 world + ARG 2 pos + METHOD method_15741 (Lnet/minecraft/class_3610;)I + ARG 0 state + METHOD method_15742 (Lnet/minecraft/class_4538;Lnet/minecraft/class_2338;ILnet/minecraft/class_2350;Lnet/minecraft/class_2680;Lnet/minecraft/class_2338;Lit/unimi/dsi/fastutil/shorts/Short2ObjectMap;Lit/unimi/dsi/fastutil/shorts/Short2BooleanMap;)I + ARG 1 world + METHOD method_15744 (Lnet/minecraft/class_1936;Lnet/minecraft/class_2338;Lnet/minecraft/class_3610;Lnet/minecraft/class_2680;)V + ARG 1 world + ARG 2 pos + ARG 3 fluidState + ARG 4 blockState 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 ARG 3 state + ARG 4 direction ARG 5 fluidState + METHOD method_15746 canFlowThrough (Lnet/minecraft/class_1922;Lnet/minecraft/class_3611;Lnet/minecraft/class_2338;Lnet/minecraft/class_2680;Lnet/minecraft/class_2350;Lnet/minecraft/class_2338;Lnet/minecraft/class_2680;Lnet/minecraft/class_3610;)Z + ARG 1 world + ARG 2 fluid + ARG 3 pos + ARG 4 state + ARG 5 face + ARG 6 fromPos + ARG 7 fromState + ARG 8 fluidState + METHOD method_15748 (Lnet/minecraft/class_3610;)Z + ARG 1 state + METHOD method_15749 (Lnet/minecraft/class_1922;Lnet/minecraft/class_2338;Lnet/minecraft/class_2350;)Z + ARG 1 world + ARG 2 pos METHOD method_15750 getFlowing ()Lnet/minecraft/class_3611; METHOD method_15751 getStill ()Lnet/minecraft/class_3611; + METHOD method_15752 isMatchingAndStill (Lnet/minecraft/class_3610;)Z + ARG 1 state METHOD method_15753 getNextTickDelay (Lnet/minecraft/class_1937;Lnet/minecraft/class_2338;Lnet/minecraft/class_3610;Lnet/minecraft/class_3610;)I ARG 1 world ARG 2 pos ARG 3 oldState ARG 4 newState + METHOD method_15754 canFill (Lnet/minecraft/class_1922;Lnet/minecraft/class_2338;Lnet/minecraft/class_2680;Lnet/minecraft/class_3611;)Z + ARG 1 world + ARG 2 pos + ARG 3 state + ARG 4 fluid METHOD method_17774 isFluidAboveEqual (Lnet/minecraft/class_3610;Lnet/minecraft/class_1922;Lnet/minecraft/class_2338;)Z ARG 0 state - ARG 1 view + ARG 1 world ARG 2 pos diff --git a/mappings/net/minecraft/fluid/Fluid.mapping b/mappings/net/minecraft/fluid/Fluid.mapping index 6b43c7268f..69de0bf42c 100644 --- a/mappings/net/minecraft/fluid/Fluid.mapping +++ b/mappings/net/minecraft/fluid/Fluid.mapping @@ -5,13 +5,26 @@ CLASS net/minecraft/class_3611 net/minecraft/fluid/Fluid METHOD method_15774 getBucketItem ()Lnet/minecraft/class_1792; METHOD method_15775 appendProperties (Lnet/minecraft/class_2689$class_2690;)V METHOD method_15776 randomDisplayTick (Lnet/minecraft/class_1937;Lnet/minecraft/class_2338;Lnet/minecraft/class_3610;Ljava/util/Random;)V + ARG 1 world + ARG 2 pos + ARG 3 state + ARG 4 random + METHOD method_15777 canBeReplacedWith (Lnet/minecraft/class_3610;Lnet/minecraft/class_1922;Lnet/minecraft/class_2338;Lnet/minecraft/class_3611;Lnet/minecraft/class_2350;)Z + ARG 1 state + ARG 2 world + ARG 3 pos + ARG 4 fluid + ARG 5 direction METHOD method_15778 onScheduledTick (Lnet/minecraft/class_1937;Lnet/minecraft/class_2338;Lnet/minecraft/class_3610;)V ARG 1 world ARG 2 pos ARG 3 state METHOD method_15779 getLevel (Lnet/minecraft/class_3610;)I + ARG 1 state METHOD method_15780 matchesType (Lnet/minecraft/class_3611;)Z + 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; ARG 1 world ARG 2 pos @@ -21,12 +34,26 @@ CLASS net/minecraft/class_3611 net/minecraft/fluid/Fluid METHOD method_15785 getDefaultState ()Lnet/minecraft/class_3610; METHOD method_15787 getParticle ()Lnet/minecraft/class_2394; METHOD method_15788 getHeight (Lnet/minecraft/class_3610;Lnet/minecraft/class_1922;Lnet/minecraft/class_2338;)F + ARG 1 state + ARG 2 world + ARG 3 pos METHOD method_15789 getTickRate (Lnet/minecraft/class_4538;)I + ARG 1 world METHOD method_15790 toBlockState (Lnet/minecraft/class_3610;)Lnet/minecraft/class_2680; + ARG 1 state METHOD method_15791 matches (Lnet/minecraft/class_3494;)Z + ARG 1 tag METHOD method_15792 onRandomTick (Lnet/minecraft/class_1937;Lnet/minecraft/class_2338;Lnet/minecraft/class_3610;Ljava/util/Random;)V + ARG 1 world + ARG 2 pos + ARG 3 state METHOD method_15793 isStill (Lnet/minecraft/class_3610;)Z + ARG 1 state 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; + ARG 1 state + ARG 2 world + ARG 3 pos METHOD method_20784 getHeight (Lnet/minecraft/class_3610;)F + ARG 1 state diff --git a/mappings/net/minecraft/fluid/FluidState.mapping b/mappings/net/minecraft/fluid/FluidState.mapping index 4504be1e68..e672a30940 100644 --- a/mappings/net/minecraft/fluid/FluidState.mapping +++ b/mappings/net/minecraft/fluid/FluidState.mapping @@ -1,6 +1,6 @@ CLASS net/minecraft/class_3610 net/minecraft/fluid/FluidState METHOD method_15756 (Lnet/minecraft/class_1922;Lnet/minecraft/class_2338;)Z - ARG 1 view + ARG 1 world ARG 2 pos METHOD method_15757 onRandomTick (Lnet/minecraft/class_1937;Lnet/minecraft/class_2338;Ljava/util/Random;)V ARG 1 world @@ -13,10 +13,15 @@ CLASS net/minecraft/class_3610 net/minecraft/fluid/FluidState METHOD method_15760 getBlastResistance ()F METHOD method_15761 getLevel ()I METHOD method_15763 getHeight (Lnet/minecraft/class_1922;Lnet/minecraft/class_2338;)F + ARG 1 world + ARG 2 pos + METHOD method_15764 (Lnet/minecraft/class_1922;Lnet/minecraft/class_2338;Lnet/minecraft/class_3611;Lnet/minecraft/class_2350;)Z + ARG 1 world METHOD method_15765 deserialize (Lcom/mojang/datafixers/Dynamic;)Lnet/minecraft/class_3610; ARG 0 dynamic METHOD method_15766 getParticle ()Lnet/minecraft/class_2394; METHOD method_15767 matches (Lnet/minecraft/class_3494;)Z + ARG 1 tag METHOD method_15768 randomDisplayTick (Lnet/minecraft/class_1937;Lnet/minecraft/class_2338;Ljava/util/Random;)V ARG 1 world ARG 2 pos @@ -32,4 +37,6 @@ 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; + ARG 1 world + ARG 2 pos METHOD method_20785 getHeight ()F diff --git a/mappings/net/minecraft/fluid/LavaFluid.mapping b/mappings/net/minecraft/fluid/LavaFluid.mapping index 80f84c88b1..e7b6b96f25 100644 --- a/mappings/net/minecraft/fluid/LavaFluid.mapping +++ b/mappings/net/minecraft/fluid/LavaFluid.mapping @@ -1,3 +1,12 @@ CLASS net/minecraft/class_3616 net/minecraft/fluid/LavaFluid + METHOD method_15817 hasBurnableBlock (Lnet/minecraft/class_4538;Lnet/minecraft/class_2338;)Z + ARG 1 world + ARG 2 pos + METHOD method_15818 playExtinguishEvent (Lnet/minecraft/class_1936;Lnet/minecraft/class_2338;)V + ARG 1 world + ARG 2 pos + METHOD method_15819 canLightFire (Lnet/minecraft/class_4538;Lnet/minecraft/class_2338;)Z + ARG 1 world + ARG 2 pos CLASS class_3617 Flowing CLASS class_3618 Still