Skip to content

Commit

Permalink
Dripstone mappings (FabricMC#1904)
Browse files Browse the repository at this point in the history 
* Dripstone mappings

* move DripstoneColumn to world/gen

* Apply suggestions from code review

Co-authored-by: YanisBft <[email protected]>

* move dripstone utils to feature/util

Co-authored-by: YanisBft <[email protected]>
  • Loading branch information
@jaskarth @YanisBft
jaskarth and YanisBft authored Dec 3, 2020
1 parent b06cc50 commit b095467
Show file tree
Hide file tree
Showing 12 changed files with 278 additions and 0 deletions.
2 changes: 2 additions & 0 deletions mappings/net/minecraft/util/math/BlockPos.mapping
View file
Original file line number Diff line number Diff line change
Expand Up @@ -174,6 +174,8 @@ CLASS net/minecraft/class_2338 net/minecraft/util/math/BlockPos
METHOD method_30513 offset (Lnet/minecraft/class_2350$class_2351;I)Lnet/minecraft/class_2338;
ARG 1 axis
ARG 2 distance
METHOD method_33096 withY (I)Lnet/minecraft/class_2338;
ARG 1 y
CLASS 1
FIELD field_23945 pos Lnet/minecraft/class_2338$class_2339;
FIELD field_23946 remaining I
Expand Down
10 changes: 10 additions & 0 deletions mappings/net/minecraft/util/math/MathHelper.mapping
View file
Original file line number Diff line number Diff line change
Expand Up @@ -224,3 +224,13 @@ CLASS net/minecraft/class_3532 net/minecraft/util/math/MathHelper
ARG 0 random
ARG 1 min
ARG 2 max
METHOD method_32854 lerpFromProgress (DDDDD)D
ARG 0 lerpValue
ARG 2 lerpStart
ARG 4 lerpEnd
ARG 6 start
ARG 8 end
METHOD method_32855 nextGaussian (Ljava/util/Random;FF)F
ARG 0 random
ARG 1 mean
ARG 2 deviation
22 changes: 22 additions & 0 deletions mappings/net/minecraft/world/gen/UniformFloatDistribution.mapping
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
CLASS net/minecraft/class_5700 net/minecraft/world/gen/UniformFloatDistribution
FIELD field_28096 CODEC Lcom/mojang/serialization/Codec;
FIELD field_28097 base F
FIELD field_28098 spread F
METHOD <init> (FF)V
ARG 1 base
ARG 2 spread
METHOD method_32856 minValue ()F
METHOD method_32857 of (F)Lnet/minecraft/class_5700;
COMMENT Creates a distribution with a constant value.
ARG 0 value
COMMENT the constant value
METHOD method_32858 of (FF)Lnet/minecraft/class_5700;
ARG 0 base
ARG 1 spread
METHOD method_32859 createValidatedCodec (FFF)Lcom/mojang/serialization/Codec;
ARG 0 minBase
ARG 1 maxBase
ARG 2 maxSpread
METHOD method_32864 getValue (Ljava/util/Random;)F
ARG 1 random
METHOD method_32866 maxValue ()F
2 changes: 2 additions & 0 deletions mappings/net/minecraft/world/gen/UniformIntDistribution.mapping
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,3 +18,5 @@ CLASS net/minecraft/class_5428 net/minecraft/world/gen/UniformIntDistribution
ARG 2 maxSpread
METHOD method_30321 getValue (Ljava/util/Random;)I
ARG 1 random
METHOD method_32870 minValue ()I
METHOD method_32871 maxValue ()I
42 changes: 42 additions & 0 deletions mappings/net/minecraft/world/gen/feature/DripstoneClusterFeature.mapping
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,42 @@
CLASS net/minecraft/class_5725 net/minecraft/world/gen/feature/DripstoneClusterFeature
METHOD method_32997 dripstoneChance (IIIILnet/minecraft/class_5731;)D
ARG 1 radiusX
ARG 2 radiusZ
ARG 3 localX
ARG 4 localZ
ARG 5 config
METHOD method_32998 isStoneOrWater (Lnet/minecraft/class_1936;Lnet/minecraft/class_2338;)Z
ARG 1 world
ARG 2 pos
METHOD method_33000 canWaterSpawn (Lnet/minecraft/class_5281;Lnet/minecraft/class_2338;)Z
ARG 1 world
ARG 2 pos
METHOD method_33001 placeDripstoneBlocks (Lnet/minecraft/class_5281;Lnet/minecraft/class_2338;ILnet/minecraft/class_2350;)V
ARG 1 world
ARG 2 pos
ARG 3 height
ARG 4 direction
METHOD method_33002 generate (Lnet/minecraft/class_5281;Ljava/util/Random;Lnet/minecraft/class_2338;IIFDIFLnet/minecraft/class_5731;)V
ARG 1 world
ARG 2 random
ARG 3 pos
ARG 4 localX
ARG 5 localZ
ARG 6 wetness
ARG 7 dripstoneChance
ARG 9 height
ARG 10 density
ARG 11 config
METHOD method_33003 clampedGaussian (Ljava/util/Random;FFFF)F
ARG 0 random
ARG 1 min
ARG 2 max
ARG 3 mean
ARG 4 deviation
METHOD method_33004 getHeight (Ljava/util/Random;IIFILnet/minecraft/class_5731;)I
ARG 1 random
ARG 2 localX
ARG 3 localZ
ARG 4 density
ARG 5 height
ARG 6 config
29 changes: 29 additions & 0 deletions mappings/net/minecraft/world/gen/feature/DripstoneClusterFeatureConfig.mapping
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,29 @@
CLASS net/minecraft/class_5731 net/minecraft/world/gen/feature/DripstoneClusterFeatureConfig
FIELD field_28213 CODEC Lcom/mojang/serialization/Codec;
FIELD field_28214 floorToCeilingSearchRange I
FIELD field_28215 height Lnet/minecraft/class_5428;
FIELD field_28216 radius Lnet/minecraft/class_5428;
FIELD field_28217 maxStalagmiteStalactiteHeightDiff I
FIELD field_28218 heightDeviation I
FIELD field_28219 dripstoneBlockLayerThickness Lnet/minecraft/class_5428;
FIELD field_28220 density Lnet/minecraft/class_5700;
FIELD field_28221 wetness Lnet/minecraft/class_5700;
FIELD field_28222 wetnessMean F
FIELD field_28223 wetnessDeviation F
FIELD field_28224 chanceOfDripstoneColumnAtMaxDistanceFromCenter F
FIELD field_28225 maxDistanceFromCenterAffectingChanceOfDripstoneColumn I
FIELD field_28226 maxDistanceFromCenterAffectingHeightBias I
METHOD <init> (ILnet/minecraft/class_5428;Lnet/minecraft/class_5428;IILnet/minecraft/class_5428;Lnet/minecraft/class_5700;Lnet/minecraft/class_5700;FFFII)V
ARG 1 floorToCeilingSearchRange
ARG 2 height
ARG 3 radius
ARG 4 maxStalagmiteStalactiteHeightDiff
ARG 5 heightDeviation
ARG 6 dripstoneBlockLayerThickness
ARG 7 density
ARG 8 wetness
ARG 9 wetnessMean
ARG 10 wetnessDeviation
ARG 11 chanceOfDripstoneColumnAtMaxDistanceFromCenter
ARG 12 maxDistanceFromCenterAffectingChanceOfDripstoneColumn
ARG 13 maxDistanceFromCenterAffectingHeightBias
44 changes: 44 additions & 0 deletions mappings/net/minecraft/world/gen/feature/LargeDripstoneFeature.mapping
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,44 @@
CLASS net/minecraft/class_5727 net/minecraft/world/gen/feature/LargeDripstoneFeature
METHOD method_33016 createGenerator (Lnet/minecraft/class_2338;ZLjava/util/Random;ILnet/minecraft/class_5700;Lnet/minecraft/class_5700;)Lnet/minecraft/class_5727$class_5728;
ARG 0 pos
ARG 1 isStalagmite
ARG 2 random
ARG 3 scale
ARG 4 bluntness
ARG 5 heightScale
CLASS class_5728 DripstoneGenerator
FIELD field_28206 pos Lnet/minecraft/class_2338;
FIELD field_28207 isStalagmite Z
FIELD field_28208 scale I
FIELD field_28209 bluntness D
FIELD field_28210 heightScale D
METHOD <init> (Lnet/minecraft/class_2338;ZIDD)V
ARG 1 pos
ARG 2 isStalagmite
ARG 3 scale
ARG 4 bluntness
ARG 6 heightScale
METHOD method_33017 getBaseScale ()I
METHOD method_33018 scale (F)I
ARG 1 height
METHOD method_33019 canGenerate (Lnet/minecraft/class_5281;Lnet/minecraft/class_5727$class_5729;)Z
ARG 1 world
ARG 2 wind
METHOD method_33020 generate (Lnet/minecraft/class_5281;Ljava/util/Random;Lnet/minecraft/class_5727$class_5729;)V
ARG 1 world
ARG 2 random
ARG 3 wind
METHOD method_33025 generateWind (Lnet/minecraft/class_5732;)Z
ARG 1 config
METHOD method_33026 getStalactiteHeight ()I
METHOD method_33028 getStalagmiteHeight ()I
CLASS class_5729 WindModifier
FIELD field_28211 y I
FIELD field_28212 wind Lnet/minecraft/class_243;
METHOD <init> (ILjava/util/Random;Lnet/minecraft/class_5700;)V
ARG 1 y
ARG 2 random
ARG 3 wind
METHOD method_33031 modify (Lnet/minecraft/class_2338;)Lnet/minecraft/class_2338;
ARG 1 pos
METHOD method_33032 create ()Lnet/minecraft/class_5727$class_5729;
21 changes: 21 additions & 0 deletions mappings/net/minecraft/world/gen/feature/LargeDripstoneFeatureConfig.mapping
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
CLASS net/minecraft/class_5732 net/minecraft/world/gen/feature/LargeDripstoneFeatureConfig
FIELD field_28227 CODEC Lcom/mojang/serialization/Codec;
FIELD field_28228 floorToCeilingSearchRange I
FIELD field_28229 columnRadius Lnet/minecraft/class_5428;
FIELD field_28230 heightScale Lnet/minecraft/class_5700;
FIELD field_28231 maxColumnRadiusToCaveHeightRatio F
FIELD field_28232 stalactiteBluntness Lnet/minecraft/class_5700;
FIELD field_28233 stalagmiteBluntness Lnet/minecraft/class_5700;
FIELD field_28234 windSpeed Lnet/minecraft/class_5700;
FIELD field_28235 minRadiusForWind I
FIELD field_28236 minBluntnessForWind F
METHOD <init> (ILnet/minecraft/class_5428;Lnet/minecraft/class_5700;FLnet/minecraft/class_5700;Lnet/minecraft/class_5700;Lnet/minecraft/class_5700;IF)V
ARG 1 floorToCeilingSearchRange
ARG 2 columnRadius
ARG 3 heightScale
ARG 4 maxColumnRadiusToCaveHeightRatio
ARG 5 stalactiteBluntness
ARG 6 stalagmiteBluntness
ARG 7 windSpeed
ARG 8 minRadiusForWind
ARG 9 minBluntnessForWind
20 changes: 20 additions & 0 deletions mappings/net/minecraft/world/gen/feature/SmallDripstoneFeature.mapping
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
CLASS net/minecraft/class_5730 net/minecraft/world/gen/feature/SmallDripstoneFeature
METHOD method_33034 generateDripstoneBlocks (Lnet/minecraft/class_5281;Ljava/util/Random;Lnet/minecraft/class_2338;)V
ARG 0 world
ARG 1 random
ARG 2 pos
METHOD method_33035 generate (Lnet/minecraft/class_5281;Ljava/util/Random;Lnet/minecraft/class_2338;Lnet/minecraft/class_5733;)Z
ARG 0 world
ARG 1 random
ARG 2 pos
ARG 3 config
METHOD method_33036 generateDripstone (Lnet/minecraft/class_5281;Ljava/util/Random;Lnet/minecraft/class_2338;Lnet/minecraft/class_2350;Lnet/minecraft/class_5733;)Z
ARG 0 world
ARG 1 random
ARG 2 pos
ARG 3 direction
ARG 4 config
METHOD method_33037 randomPos (Ljava/util/Random;Lnet/minecraft/class_2338;Lnet/minecraft/class_5733;)Lnet/minecraft/class_2338;
ARG 0 random
ARG 1 pos
ARG 2 config
11 changes: 11 additions & 0 deletions mappings/net/minecraft/world/gen/feature/SmallDripstoneFeatureConfig.mapping
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
CLASS net/minecraft/class_5733 net/minecraft/world/gen/feature/SmallDripstoneFeatureConfig
FIELD field_28237 CODEC Lcom/mojang/serialization/Codec;
FIELD field_28238 maxPlacements I
FIELD field_28239 emptySpaceSearchRadius I
FIELD field_28240 maxOffsetFromOrigin I
FIELD field_28241 chanceOfTallerDripstone F
METHOD <init> (IIIF)V
ARG 1 maxPlacements
ARG 2 emptySpaceSearchRadius
ARG 3 maxOffsetFromOrigin
ARG 4 chanceOfTallerDripstone
39 changes: 39 additions & 0 deletions mappings/net/minecraft/world/gen/feature/util/DripstoneColumn.mapping
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,39 @@
CLASS net/minecraft/class_5721 net/minecraft/world/gen/feature/util/DripstoneColumn
METHOD method_32980 createEmpty ()Lnet/minecraft/class_5721;
METHOD method_32981 createHalfWithCeiling (I)Lnet/minecraft/class_5721;
ARG 0 ceiling
METHOD method_32982 create (Lnet/minecraft/class_3746;Lnet/minecraft/class_2338;ILjava/util/function/Predicate;Ljava/util/function/Predicate;)Ljava/util/Optional;
ARG 0 world
ARG 1 pos
ARG 2 height
ARG 3 canGenerate
ARG 4 canReplace
METHOD method_32983 withFloor (Ljava/util/OptionalInt;)Lnet/minecraft/class_5721;
ARG 1 floor
METHOD method_32984 create (Ljava/util/OptionalInt;Ljava/util/OptionalInt;)Lnet/minecraft/class_5721;
ARG 0 ceilingHeight
ARG 1 floorHeight
METHOD method_32985 getCeilingHeight ()Ljava/util/OptionalInt;
METHOD method_32986 createBounded (II)Lnet/minecraft/class_5721$class_5723;
ARG 0 floor
ARG 1 ceiling
METHOD method_32987 getFloorHeight ()Ljava/util/OptionalInt;
METHOD method_32988 createHalfWithFloor (I)Lnet/minecraft/class_5721;
ARG 0 floor
CLASS class_5722 Empty
FIELD field_28197 INSTANCE Lnet/minecraft/class_5721$class_5722;
CLASS class_5723 Bounded
FIELD field_28198 floor I
FIELD field_28199 ceiling I
METHOD <init> (II)V
ARG 1 floor
ARG 2 ceiling
METHOD method_32990 getCeiling ()I
METHOD method_32991 getFloor ()I
METHOD method_32992 getHeight ()I
CLASS class_5724 Half
FIELD field_28200 height I
FIELD field_28201 floor Z
METHOD <init> (IZ)V
ARG 1 height
ARG 2 floor
36 changes: 36 additions & 0 deletions mappings/net/minecraft/world/gen/feature/util/DripstoneHelper.mapping
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,36 @@
CLASS net/minecraft/class_5726 net/minecraft/world/gen/feature/util/DripstoneHelper
METHOD method_33005 scaleHeightFromRadius (DDDD)D
ARG 0 radius
ARG 2 scale
ARG 4 heightScale
ARG 6 bluntness
METHOD method_33006 canGenerate (Lnet/minecraft/class_1936;Lnet/minecraft/class_2338;)Z
ARG 0 world
ARG 1 pos
METHOD method_33007 (Lnet/minecraft/class_5281;Lnet/minecraft/class_2338$class_2339;Lnet/minecraft/class_2350;Lnet/minecraft/class_2680;)V
ARG 3 state
METHOD method_33008 generateDripstoneBlock (Lnet/minecraft/class_5281;Lnet/minecraft/class_2338;)Z
ARG 0 world
ARG 1 pos
METHOD method_33009 canGenerateBase (Lnet/minecraft/class_5281;Lnet/minecraft/class_2338;I)Z
ARG 0 world
ARG 1 pos
ARG 2 height
METHOD method_33010 generatePointedDripstone (Lnet/minecraft/class_5281;Lnet/minecraft/class_2338;Lnet/minecraft/class_2350;IZ)V
ARG 0 world
ARG 1 pos
ARG 2 direction
ARG 3 height
ARG 4 merge
METHOD method_33011 canReplace (Lnet/minecraft/class_2680;)Z
ARG 0 state
METHOD method_33012 getDripstoneThickness (Lnet/minecraft/class_2350;IZLjava/util/function/Consumer;)V
ARG 0 direction
ARG 1 height
ARG 2 merge
ARG 3 callback
METHOD method_33013 getState (Lnet/minecraft/class_2350;Lnet/minecraft/class_5691;)Lnet/minecraft/class_2680;
ARG 0 direction
ARG 1 thickness
METHOD method_33014 canGenerate (Lnet/minecraft/class_2680;)Z
ARG 0 state

0 comments on commit b095467

Please sign in to comment.