From 3624162aead555a0faac1b8bc5c5c1a999a975af Mon Sep 17 00:00:00 2001 From: Virtuoel Date: Thu, 24 Jan 2019 16:08:16 +0300 Subject: [PATCH] Some Fluid mappings (#421) --- mappings/net/minecraft/fluid/BaseFluid.mapping | 3 ++- mappings/net/minecraft/fluid/EmptyFluid.mapping | 2 ++ mappings/net/minecraft/fluid/Fluid.mapping | 4 ++++ mappings/net/minecraft/fluid/FluidState.mapping | 3 +++ mappings/net/minecraft/fluid/LavaFluid.mapping | 4 ++++ mappings/net/minecraft/fluid/WaterFluid.mapping | 4 ++++ mappings/net/minecraft/state/property/Properties.mapping | 2 +- 7 files changed, 20 insertions(+), 2 deletions(-) diff --git a/mappings/net/minecraft/fluid/BaseFluid.mapping b/mappings/net/minecraft/fluid/BaseFluid.mapping index ffc694a47c..5ac1fcc035 100644 --- a/mappings/net/minecraft/fluid/BaseFluid.mapping +++ b/mappings/net/minecraft/fluid/BaseFluid.mapping @@ -1,9 +1,10 @@ CLASS cfu net/minecraft/fluid/BaseFluid - FIELD a STILL Lbra; + FIELD a FALLING Lbra; FIELD b LEVEL Lbri; METHOD a (IZ)Lcfw; ARG 1 level ARG 2 still + METHOD a onScheduledTick (Lbci;Let;Lcfw;)V METHOD a (Lbcm;Let;Lbqi;)Lcfw; ARG 1 world ARG 2 pos diff --git a/mappings/net/minecraft/fluid/EmptyFluid.mapping b/mappings/net/minecraft/fluid/EmptyFluid.mapping index 17a693c71d..e9162496c0 100644 --- a/mappings/net/minecraft/fluid/EmptyFluid.mapping +++ b/mappings/net/minecraft/fluid/EmptyFluid.mapping @@ -1,8 +1,10 @@ CLASS cft net/minecraft/fluid/EmptyFluid METHOD a getRenderLayer ()Lbbu; + METHOD a getTickRate (Lbcm;)I METHOD a toBlockState (Lcfw;)Lbqi; METHOD b getBucketItem ()Lawx; METHOD b isStill (Lcfw;)Z METHOD b getShape (Lcfw;Lbbt;Let;)Lcnr; METHOD c isEmpty ()Z + METHOD c getLevel (Lcfw;)I METHOD d getBlastResistance ()F diff --git a/mappings/net/minecraft/fluid/Fluid.mapping b/mappings/net/minecraft/fluid/Fluid.mapping index 9e01fd348b..7ecd27c04a 100644 --- a/mappings/net/minecraft/fluid/Fluid.mapping +++ b/mappings/net/minecraft/fluid/Fluid.mapping @@ -3,6 +3,9 @@ CLASS cfv net/minecraft/fluid/Fluid FIELD c STATE_IDS Lfc; FIELD d stateFactory Lbqj; METHOD a getRenderLayer ()Lbbu; + METHOD a onScheduledTick (Lbci;Let;Lcfw;)V + METHOD a randomDisplayTick (Lbci;Let;Lcfw;Ljava/util/Random;)V + METHOD a getTickRate (Lbcm;)I METHOD a appendProperties (Lbqj$a;)V METHOD a matchesType (Lcfv;)Z METHOD a toBlockState (Lcfw;)Lbqi; @@ -12,6 +15,7 @@ CLASS cfv net/minecraft/fluid/Fluid METHOD b isStill (Lcfw;)Z METHOD b getShape (Lcfw;Lbbt;Let;)Lcnr; METHOD c isEmpty ()Z + METHOD c getLevel (Lcfw;)I METHOD d getBlastResistance ()F METHOD e setDefaultState (Lcfw;)V METHOD h getStateFactory ()Lbqj; diff --git a/mappings/net/minecraft/fluid/FluidState.mapping b/mappings/net/minecraft/fluid/FluidState.mapping index 450e189d87..b569271f4f 100644 --- a/mappings/net/minecraft/fluid/FluidState.mapping +++ b/mappings/net/minecraft/fluid/FluidState.mapping @@ -1,4 +1,6 @@ CLASS cfw net/minecraft/fluid/FluidState + METHOD a onScheduledTick (Lbci;Let;)V + METHOD a randomDisplayTick (Lbci;Let;Ljava/util/Random;)V METHOD a deserialize (Lcom/mojang/datafixers/Dynamic;)Lcfw; ARG 0 dynamic METHOD a serialize (Lcom/mojang/datafixers/types/DynamicOps;Lcfw;)Lcom/mojang/datafixers/Dynamic; @@ -10,6 +12,7 @@ CLASS cfw net/minecraft/fluid/FluidState METHOD d isStill ()Z METHOD d getShape (Lbbt;Let;)Lcnr; METHOD e isEmpty ()Z + METHOD f getLevel ()I METHOD g hasRandomTicks ()Z METHOD h getBlockState ()Lbqi; METHOD j getRenderLayer ()Lbbu; diff --git a/mappings/net/minecraft/fluid/LavaFluid.mapping b/mappings/net/minecraft/fluid/LavaFluid.mapping index c3e4795e4a..9db791fbbf 100644 --- a/mappings/net/minecraft/fluid/LavaFluid.mapping +++ b/mappings/net/minecraft/fluid/LavaFluid.mapping @@ -2,9 +2,13 @@ CLASS cfz net/minecraft/fluid/LavaFluid CLASS cfz$a Flowing METHOD a appendProperties (Lbqj$a;)V METHOD b isStill (Lcfw;)Z + METHOD c getLevel (Lcfw;)I CLASS cfz$b Still METHOD b isStill (Lcfw;)Z + METHOD c getLevel (Lcfw;)I METHOD a getRenderLayer ()Lbbu; + METHOD a randomDisplayTick (Lbci;Let;Lcfw;Ljava/util/Random;)V + METHOD a getTickRate (Lbcm;)I METHOD a matchesType (Lcfv;)Z METHOD a toBlockState (Lcfw;)Lbqi; METHOD b getBucketItem ()Lawx; diff --git a/mappings/net/minecraft/fluid/WaterFluid.mapping b/mappings/net/minecraft/fluid/WaterFluid.mapping index 8b7c826d27..6da463daae 100644 --- a/mappings/net/minecraft/fluid/WaterFluid.mapping +++ b/mappings/net/minecraft/fluid/WaterFluid.mapping @@ -2,9 +2,13 @@ CLASS cgd net/minecraft/fluid/WaterFluid CLASS cgd$a Flowing METHOD a appendProperties (Lbqj$a;)V METHOD b isStill (Lcfw;)Z + METHOD c getLevel (Lcfw;)I CLASS cgd$b Still METHOD b isStill (Lcfw;)Z + METHOD c getLevel (Lcfw;)I METHOD a getRenderLayer ()Lbbu; + METHOD a randomDisplayTick (Lbci;Let;Lcfw;Ljava/util/Random;)V + METHOD a getTickRate (Lbcm;)I METHOD a matchesType (Lcfv;)Z METHOD a toBlockState (Lcfw;)Lbqi; METHOD b getBucketItem ()Lawx; diff --git a/mappings/net/minecraft/state/property/Properties.mapping b/mappings/net/minecraft/state/property/Properties.mapping index 1fb4042765..c570954901 100644 --- a/mappings/net/minecraft/state/property/Properties.mapping +++ b/mappings/net/minecraft/state/property/Properties.mapping @@ -45,7 +45,7 @@ CLASS bqz net/minecraft/state/property/Properties FIELD ak LAYERS Lbri; FIELD al CAULDRON_LEVEL Lbri; FIELD am COMPOSTER_LEVEL Lbri; - FIELD an BLOCK_LEVEL Lbri; + FIELD an FLUID_LEVEL Lbri; FIELD ao FLUID_BLOCK_LEVEL Lbri; FIELD ap MOISTURE Lbri; FIELD aq NOTE Lbri;