Mappings for 1.18-pre1 placement modifiers (#2819)

* Mappings for 1.18-pre1 placement modifiers

* Some feature mappings

* Applied review suggestions
This commit is contained in:
mschae23 2021-11-14 21:30:34 +01:00 committed by GitHub
parent 538476df3f
commit a76fb4aa58
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
34 changed files with 210 additions and 43 deletions

View File

@ -1,2 +0,0 @@
CLASS net/minecraft/class_6797
METHOD method_14452 getPositions (Lnet/minecraft/class_5444;Ljava/util/Random;Lnet/minecraft/class_2338;)Ljava/util/stream/Stream;

View File

@ -20,6 +20,7 @@ CLASS net/minecraft/class_5458 net/minecraft/util/registry/BuiltinRegistries
FIELD field_25935 ROOT Lnet/minecraft/class_2385;
FIELD field_26375 CHUNK_GENERATOR_SETTINGS Lnet/minecraft/class_2378;
FIELD field_35435 NOISE_PARAMETERS Lnet/minecraft/class_2378;
FIELD field_35761 PLACED_FEATURE Lnet/minecraft/class_2378;
METHOD method_30559 init ()V
METHOD method_30560 set (Lnet/minecraft/class_2378;Lnet/minecraft/class_5321;Ljava/lang/Object;)Ljava/lang/Object;
ARG 0 registry

View File

@ -139,6 +139,9 @@ CLASS net/minecraft/class_2378 net/minecraft/util/registry/Registry
FIELD field_35306 MATERIAL_RULE_KEY Lnet/minecraft/class_5321;
FIELD field_35307 MATERIAL_CONDITION Lnet/minecraft/class_2378;
FIELD field_35308 MATERIAL_RULE Lnet/minecraft/class_2378;
FIELD field_35758 PLACED_FEATURE_KEY Lnet/minecraft/class_5321;
FIELD field_35759 PLACEMENT_MODIFIER_TYPE_KEY Lnet/minecraft/class_5321;
FIELD field_35760 PLACEMENT_MODIFIER_TYPE Lnet/minecraft/class_2378;
METHOD <init> (Lnet/minecraft/class_5321;Lcom/mojang/serialization/Lifecycle;)V
ARG 1 key
ARG 2 lifecycle

View File

@ -1,4 +1,5 @@
CLASS net/minecraft/class_6661 net/minecraft/world/gen/decorator/ConditionalDecorator
CLASS net/minecraft/class_6661 net/minecraft/world/gen/decorator/AbstractConditionalPlacementModifier
METHOD method_38918 shouldPlace (Lnet/minecraft/class_5444;Ljava/util/Random;Lnet/minecraft/class_2338;)Z
ARG 1 context
ARG 2 random
ARG 3 pos

View File

@ -1,3 +1,4 @@
CLASS net/minecraft/class_5857 net/minecraft/world/gen/decorator/AbstractCountDecorator
CLASS net/minecraft/class_5857 net/minecraft/world/gen/decorator/AbstractCountPlacementModifier
METHOD method_14452 getCount (Ljava/util/Random;Lnet/minecraft/class_2338;)I
ARG 1 random
ARG 2 pos

View File

@ -0,0 +1,4 @@
CLASS net/minecraft/class_6792 net/minecraft/world/gen/decorator/BiomePlacementModifier
FIELD field_35714 MODIFIER_CODEC Lcom/mojang/serialization/Codec;
FIELD field_35715 INSTANCE Lnet/minecraft/class_6792;
METHOD method_39614 of ()Lnet/minecraft/class_6792;

View File

@ -1,5 +0,0 @@
CLASS net/minecraft/class_6658 net/minecraft/world/gen/decorator/BlockFilterDecoratorConfig
FIELD field_35075 CODEC Lcom/mojang/serialization/Codec;
FIELD field_35076 predicate Lnet/minecraft/class_6646;
METHOD <init> (Lnet/minecraft/class_6646;)V
ARG 1 predicate

View File

@ -0,0 +1,7 @@
CLASS net/minecraft/class_6658 net/minecraft/world/gen/decorator/BlockFilterPlacementModifier
FIELD field_35075 MODIFIER_CODEC Lcom/mojang/serialization/Codec;
FIELD field_35076 predicate Lnet/minecraft/class_6646;
METHOD <init> (Lnet/minecraft/class_6646;)V
ARG 1 predicate
METHOD method_39618 of (Lnet/minecraft/class_6646;)Lnet/minecraft/class_6658;
ARG 0 predicate

View File

@ -1,7 +0,0 @@
CLASS net/minecraft/class_5851 net/minecraft/world/gen/decorator/CarvingMaskDecoratorConfig
FIELD field_28934 CODEC Lcom/mojang/serialization/Codec;
FIELD field_28935 carver Lnet/minecraft/class_2893$class_2894;
METHOD <init> (Lnet/minecraft/class_2893$class_2894;)V
ARG 1 carver
METHOD method_33862 (Lnet/minecraft/class_5851;)Lnet/minecraft/class_2893$class_2894;
ARG 0 config

View File

@ -0,0 +1,9 @@
CLASS net/minecraft/class_5851 net/minecraft/world/gen/decorator/CarvingMaskPlacementModifier
FIELD field_28934 MODIFIER_CODEC Lcom/mojang/serialization/Codec;
FIELD field_28935 step Lnet/minecraft/class_2893$class_2894;
METHOD <init> (Lnet/minecraft/class_2893$class_2894;)V
ARG 1 step
METHOD method_33862 (Lnet/minecraft/class_5851;)Lnet/minecraft/class_2893$class_2894;
ARG 0 config
METHOD method_39619 of (Lnet/minecraft/class_2893$class_2894;)Lnet/minecraft/class_5851;
ARG 0 step

View File

@ -1,9 +0,0 @@
CLASS net/minecraft/class_5452 net/minecraft/world/gen/decorator/CountMultilayerDecorator
METHOD method_30472 blocksSpawn (Lnet/minecraft/class_2680;)Z
ARG 0 state
METHOD method_30473 findPos (Lnet/minecraft/class_5444;IIII)I
ARG 0 context
ARG 1 x
ARG 2 y
ARG 3 z
ARG 4 targetY

View File

@ -0,0 +1,17 @@
CLASS net/minecraft/class_5452 net/minecraft/world/gen/decorator/CountMultilayerPlacementModifier
FIELD field_35716 MODIFIER_CODEC Lcom/mojang/serialization/Codec;
FIELD field_35717 count Lnet/minecraft/class_6017;
METHOD <init> (Lnet/minecraft/class_6017;)V
ARG 1 count
METHOD method_30472 blocksSpawn (Lnet/minecraft/class_2680;)Z
ARG 0 state
METHOD method_30473 findPos (Lnet/minecraft/class_5444;IIII)I
ARG 0 context
ARG 1 x
ARG 2 y
ARG 3 z
ARG 4 targetY
METHOD method_39620 of (I)Lnet/minecraft/class_5452;
ARG 0 count
METHOD method_39621 of (Lnet/minecraft/class_6017;)Lnet/minecraft/class_5452;
ARG 0 count

View File

@ -0,0 +1,9 @@
CLASS net/minecraft/class_6793 net/minecraft/world/gen/decorator/CountPlacementModifier
FIELD field_35718 MODIFIER_CODEC Lcom/mojang/serialization/Codec;
FIELD field_35719 count Lnet/minecraft/class_6017;
METHOD <init> (Lnet/minecraft/class_6017;)V
ARG 1 count
METHOD method_39623 of (I)Lnet/minecraft/class_6793;
ARG 0 count
METHOD method_39624 of (Lnet/minecraft/class_6017;)Lnet/minecraft/class_6793;
ARG 0 count

View File

@ -1,8 +1,11 @@
CLASS net/minecraft/class_5444 net/minecraft/world/gen/decorator/DecoratorContext
FIELD field_25857 world Lnet/minecraft/class_5281;
FIELD field_35734 generator Lnet/minecraft/class_2794;
FIELD field_35735 placedFeature Ljava/util/Optional;
METHOD <init> (Lnet/minecraft/class_5281;Lnet/minecraft/class_2794;Ljava/util/Optional;)V
ARG 1 world
ARG 2 generator
ARG 3 placedFeature
METHOD method_30459 getOrCreateCarvingMask (Lnet/minecraft/class_1923;Lnet/minecraft/class_2893$class_2894;)Lnet/minecraft/class_6643;
ARG 1 chunkPos
ARG 2 carver
@ -14,3 +17,5 @@ CLASS net/minecraft/class_5444 net/minecraft/world/gen/decorator/DecoratorContex
ARG 1 pos
METHOD method_33868 getBottomY ()I
METHOD method_34383 getWorld ()Lnet/minecraft/class_5281;
METHOD method_39652 getPlacedFeature ()Ljava/util/Optional;
METHOD method_39653 getChunkGenerator ()Lnet/minecraft/class_2794;

View File

@ -0,0 +1,20 @@
CLASS net/minecraft/class_6794 net/minecraft/world/gen/decorator/EnvironmentScanPlacementModifier
FIELD field_35720 MODIFIER_CODEC Lcom/mojang/serialization/Codec;
FIELD field_35721 direction Lnet/minecraft/class_2350;
FIELD field_35722 targetPredicate Lnet/minecraft/class_6646;
FIELD field_35723 allowedSearchPredicate Lnet/minecraft/class_6646;
FIELD field_35724 maxSteps I
METHOD <init> (Lnet/minecraft/class_2350;Lnet/minecraft/class_6646;Lnet/minecraft/class_6646;I)V
ARG 1 direction
ARG 2 targetPredicate
ARG 3 allowedSearchPredicate
ARG 4 maxSteps
METHOD method_39628 of (Lnet/minecraft/class_2350;Lnet/minecraft/class_6646;I)Lnet/minecraft/class_6794;
ARG 0 direction
ARG 1 targetPredicate
ARG 2 maxSteps
METHOD method_39629 of (Lnet/minecraft/class_2350;Lnet/minecraft/class_6646;Lnet/minecraft/class_6646;I)Lnet/minecraft/class_6794;
ARG 0 direction
ARG 1 targetPredicate
ARG 2 allowedSearchPredicate
ARG 3 maxSteps

View File

@ -0,0 +1,13 @@
CLASS net/minecraft/class_6795 net/minecraft/world/gen/decorator/HeightRangePlacementModifier
FIELD field_35725 MODIFIER_CODEC Lcom/mojang/serialization/Codec;
FIELD field_35726 height Lnet/minecraft/class_6122;
METHOD <init> (Lnet/minecraft/class_6122;)V
ARG 1 height
METHOD method_39634 uniform (Lnet/minecraft/class_5843;Lnet/minecraft/class_5843;)Lnet/minecraft/class_6795;
ARG 0 minOffset
ARG 1 maxOffset
METHOD method_39635 of (Lnet/minecraft/class_6122;)Lnet/minecraft/class_6795;
ARG 0 height
METHOD method_39637 trapezoid (Lnet/minecraft/class_5843;Lnet/minecraft/class_5843;)Lnet/minecraft/class_6795;
ARG 0 minOffset
ARG 1 maxOffset

View File

@ -1,7 +1,9 @@
CLASS net/minecraft/class_5925 net/minecraft/world/gen/decorator/HeightmapDecoratorConfig
FIELD field_29265 CODEC Lcom/mojang/serialization/Codec;
CLASS net/minecraft/class_5925 net/minecraft/world/gen/decorator/HeightmapPlacementModifier
FIELD field_29265 MODIFIER_CODEC Lcom/mojang/serialization/Codec;
FIELD field_29266 heightmap Lnet/minecraft/class_2902$class_2903;
METHOD <init> (Lnet/minecraft/class_2902$class_2903;)V
ARG 1 heightmap
METHOD method_34330 (Lcom/mojang/serialization/codecs/RecordCodecBuilder$Instance;)Lcom/mojang/datafixers/kinds/App;
ARG 0 instance
METHOD method_39638 of (Lnet/minecraft/class_2902$class_2903;)Lnet/minecraft/class_5925;
ARG 0 heightmap

View File

@ -1,11 +1,15 @@
CLASS net/minecraft/class_3275 net/minecraft/world/gen/decorator/CountNoiseBiasedDecoratorConfig
CLASS net/minecraft/class_3275 net/minecraft/world/gen/decorator/NoiseBasedCountPlacementModifier
FIELD field_14205 noiseOffset D
FIELD field_14206 noiseFactor D
FIELD field_14208 noiseToCountRatio I
FIELD field_24987 CODEC Lcom/mojang/serialization/Codec;
FIELD field_24987 MODIFIER_CODEC Lcom/mojang/serialization/Codec;
METHOD <init> (IDD)V
ARG 1 noiseToCountRatio
ARG 2 noiseFactor
ARG 4 noiseOffset
METHOD method_28939 (Lcom/mojang/serialization/codecs/RecordCodecBuilder$Instance;)Lcom/mojang/datafixers/kinds/App;
ARG 0 instance
METHOD method_39641 of (IDD)Lnet/minecraft/class_3275;
ARG 0 noiseToCountRatio
ARG 1 noiseFactor
ARG 3 noiseOffset

View File

@ -1,11 +1,15 @@
CLASS net/minecraft/class_3003 net/minecraft/world/gen/decorator/CountNoiseDecoratorConfig
CLASS net/minecraft/class_3003 net/minecraft/world/gen/decorator/NoiseThresholdCountPlacementModifier
FIELD field_13444 noiseLevel D
FIELD field_13445 aboveNoise I
FIELD field_13446 belowNoise I
FIELD field_24890 CODEC Lcom/mojang/serialization/Codec;
FIELD field_24890 MODIFIER_CODEC Lcom/mojang/serialization/Codec;
METHOD <init> (DII)V
ARG 1 noiseLevel
ARG 3 belowNoise
ARG 4 aboveNoise
METHOD method_28733 (Lcom/mojang/serialization/codecs/RecordCodecBuilder$Instance;)Lcom/mojang/datafixers/kinds/App;
ARG 0 instance
METHOD method_39642 of (DII)Lnet/minecraft/class_3003;
ARG 0 noiseLevel
ARG 2 belowNoise
ARG 3 aboveNoise

View File

@ -0,0 +1,7 @@
CLASS net/minecraft/class_6797 net/minecraft/world/gen/decorator/PlacementModifier
FIELD field_35736 CODEC Lcom/mojang/serialization/Codec;
METHOD method_14452 getPositions (Lnet/minecraft/class_5444;Ljava/util/Random;Lnet/minecraft/class_2338;)Ljava/util/stream/Stream;
ARG 1 context
ARG 2 random
ARG 3 pos
METHOD method_39615 getType ()Lnet/minecraft/class_6798;

View File

@ -0,0 +1,4 @@
CLASS net/minecraft/class_6798 net/minecraft/world/gen/decorator/PlacementModifierType
METHOD method_39655 register (Ljava/lang/String;Lcom/mojang/serialization/Codec;)Lnet/minecraft/class_6798;
ARG 0 id
ARG 1 codec

View File

@ -0,0 +1,14 @@
CLASS net/minecraft/class_6732 net/minecraft/world/gen/decorator/RandomOffsetPlacementModifier
FIELD field_35419 MODIFIER_CODEC Lcom/mojang/serialization/Codec;
FIELD field_35420 spreadXz Lnet/minecraft/class_6017;
FIELD field_35421 spreadY Lnet/minecraft/class_6017;
METHOD <init> (Lnet/minecraft/class_6017;Lnet/minecraft/class_6017;)V
ARG 1 xzSpread
ARG 2 ySpread
METHOD method_39656 vertically (Lnet/minecraft/class_6017;)Lnet/minecraft/class_6732;
ARG 0 spreadY
METHOD method_39657 of (Lnet/minecraft/class_6017;Lnet/minecraft/class_6017;)Lnet/minecraft/class_6732;
ARG 0 spreadXz
ARG 1 spreadY
METHOD method_39658 horizontally (Lnet/minecraft/class_6017;)Lnet/minecraft/class_6732;
ARG 0 spreadXz

View File

@ -0,0 +1,7 @@
CLASS net/minecraft/class_6799 net/minecraft/world/gen/decorator/RarityFilterPlacementModifier
FIELD field_35752 MODIFIER_CODEC Lcom/mojang/serialization/Codec;
FIELD field_35753 chance I
METHOD <init> (I)V
ARG 1 chance
METHOD method_39659 of (I)Lnet/minecraft/class_6799;
ARG 0 chance

View File

@ -1,7 +0,0 @@
CLASS net/minecraft/class_6732 net/minecraft/world/gen/decorator/ScatterDecoratorConfig
FIELD field_35419 CODEC Lcom/mojang/serialization/Codec;
FIELD field_35420 xzSpread Lnet/minecraft/class_6017;
FIELD field_35421 ySpread Lnet/minecraft/class_6017;
METHOD <init> (Lnet/minecraft/class_6017;Lnet/minecraft/class_6017;)V
ARG 1 xzSpread
ARG 2 ySpread

View File

@ -1 +0,0 @@
CLASS net/minecraft/class_5450 net/minecraft/world/gen/decorator/SquareDecorator

View File

@ -0,0 +1,4 @@
CLASS net/minecraft/class_5450 net/minecraft/world/gen/decorator/SquarePlacementModifier
FIELD field_35727 MODIFIER_CODEC Lcom/mojang/serialization/Codec;
FIELD field_35728 INSTANCE Lnet/minecraft/class_5450;
METHOD method_39639 of ()Lnet/minecraft/class_5450;

View File

@ -1,5 +1,5 @@
CLASS net/minecraft/class_6584 net/minecraft/world/gen/decorator/SurfaceRelativeThresholdDecoratorConfig
FIELD field_34721 CODEC Lcom/mojang/serialization/Codec;
CLASS net/minecraft/class_6584 net/minecraft/world/gen/decorator/SurfaceThresholdFilterPlacementModifier
FIELD field_34721 MODIFIER_CODEC Lcom/mojang/serialization/Codec;
FIELD field_34722 heightmap Lnet/minecraft/class_2902$class_2903;
FIELD field_34723 min I
FIELD field_34724 max I
@ -7,3 +7,7 @@ CLASS net/minecraft/class_6584 net/minecraft/world/gen/decorator/SurfaceRelative
ARG 1 heightmap
ARG 2 min
ARG 3 max
METHOD method_39661 of (Lnet/minecraft/class_2902$class_2903;II)Lnet/minecraft/class_6584;
ARG 0 heightmap
ARG 1 min
ARG 2 max

View File

@ -1,7 +1,9 @@
CLASS net/minecraft/class_5934 net/minecraft/world/gen/decorator/WaterDepthThresholdDecoratorConfig
FIELD field_29323 CODEC Lcom/mojang/serialization/Codec;
CLASS net/minecraft/class_5934 net/minecraft/world/gen/decorator/SurfaceWaterDepthFilterPlacementModifier
FIELD field_29323 MODIFIER_CODEC Lcom/mojang/serialization/Codec;
FIELD field_29324 maxWaterDepth I
METHOD <init> (I)V
ARG 1 maxWaterDepth
METHOD method_34386 (Lcom/mojang/serialization/codecs/RecordCodecBuilder$Instance;)Lcom/mojang/datafixers/kinds/App;
ARG 0 instance
METHOD method_39662 of (I)Lnet/minecraft/class_5934;
ARG 0 maxWaterDepth

View File

@ -4,6 +4,7 @@ CLASS net/minecraft/class_2975 net/minecraft/world/gen/feature/ConfiguredFeature
FIELD field_21589 LOGGER Lorg/apache/logging/log4j/Logger;
FIELD field_24833 REGISTRY_CODEC Lcom/mojang/serialization/Codec;
FIELD field_25833 CODEC Lcom/mojang/serialization/Codec;
FIELD field_26756 LIST_CODEC Lcom/mojang/serialization/Codec;
METHOD <init> (Lnet/minecraft/class_3031;Lnet/minecraft/class_3037;)V
ARG 1 feature
ARG 2 config
@ -15,3 +16,12 @@ CLASS net/minecraft/class_2975 net/minecraft/world/gen/feature/ConfiguredFeature
METHOD method_30380 getFeature ()Lnet/minecraft/class_3031;
METHOD method_30381 getConfig ()Lnet/minecraft/class_3037;
METHOD method_30648 getDecoratedFeatures ()Ljava/util/stream/Stream;
METHOD method_39591 withWouldSurviveFilter (Lnet/minecraft/class_2248;)Lnet/minecraft/class_6796;
ARG 1 block
METHOD method_39592 withBlockPredicateFilter (Lnet/minecraft/class_6646;)Lnet/minecraft/class_6796;
ARG 1 predicate
METHOD method_39593 withPlacement (Ljava/util/List;)Lnet/minecraft/class_6796;
ARG 1 modifiers
METHOD method_39594 withPlacement ([Lnet/minecraft/class_6797;)Lnet/minecraft/class_6796;
ARG 1 modifiers
METHOD method_39595 withInAirFilter ()Lnet/minecraft/class_6796;

View File

@ -1,2 +1,4 @@
CLASS net/minecraft/class_3085 net/minecraft/world/gen/feature/LakeFeature
FIELD field_13668 CAVE_AIR Lnet/minecraft/class_2680;
CLASS class_6788 Config
FIELD field_35706 CODEC Lcom/mojang/serialization/Codec;

View File

@ -0,0 +1,8 @@
CLASS net/minecraft/class_6789 net/minecraft/world/gen/feature/NetherForestVegetationFeatureConfig
FIELD field_35707 VEGETATION_CODEC Lcom/mojang/serialization/Codec;
FIELD field_35708 spreadWidth I
FIELD field_35709 spreadHeight I
METHOD <init> (Lnet/minecraft/class_4651;II)V
ARG 1 stateProvider
ARG 2 spreadWidth
ARG 3 spreadHeight

View File

@ -0,0 +1,24 @@
CLASS net/minecraft/class_6796 net/minecraft/world/gen/feature/PlacedFeature
FIELD field_35729 CODEC Lcom/mojang/serialization/Codec;
FIELD field_35730 REGISTRY_CODEC Lcom/mojang/serialization/Codec;
FIELD field_35731 LIST_CODEC Lcom/mojang/serialization/Codec;
FIELD field_35732 feature Ljava/util/function/Supplier;
FIELD field_35733 placementModifiers Ljava/util/List;
METHOD <init> (Ljava/util/function/Supplier;Ljava/util/List;)V
ARG 1 feature
ARG 2 placementModifiers
METHOD method_39643 getDecoratedFeatures ()Ljava/util/stream/Stream;
METHOD method_39644 generateUnregistered (Lnet/minecraft/class_5281;Lnet/minecraft/class_2794;Ljava/util/Random;Lnet/minecraft/class_2338;)Z
ARG 1 world
ARG 2 generator
ARG 3 random
ARG 4 pos
METHOD method_39648 generate (Lnet/minecraft/class_5444;Ljava/util/Random;Lnet/minecraft/class_2338;)Z
ARG 1 context
ARG 2 random
ARG 3 pos
METHOD method_39650 generate (Lnet/minecraft/class_5281;Lnet/minecraft/class_2794;Ljava/util/Random;Lnet/minecraft/class_2338;)Z
ARG 1 world
ARG 2 generator
ARG 3 random
ARG 4 pos

View File

@ -0,0 +1,10 @@
CLASS net/minecraft/class_6817 net/minecraft/world/gen/feature/PlacedFeatures
FIELD field_36078 MOTION_BLOCKING_HEIGHTMAP Lnet/minecraft/class_6797;
FIELD field_36079 OCEAN_FLOOR_WG_HEIGHTMAP Lnet/minecraft/class_6797;
FIELD field_36080 WORLD_SURFACE_WG_HEIGHTMAP Lnet/minecraft/class_6797;
FIELD field_36081 OCEAN_FLOOR_HEIGHTMAP Lnet/minecraft/class_6797;
FIELD field_36082 BOTTOM_TO_TOP_RANGE Lnet/minecraft/class_6797;
FIELD field_36086 BOTTOM_TO_120_RANGE Lnet/minecraft/class_6797;
METHOD method_39737 register (Ljava/lang/String;Lnet/minecraft/class_6796;)Lnet/minecraft/class_6796;
ARG 0 id
ARG 1 feature

View File

@ -0,0 +1,2 @@
CLASS net/minecraft/class_6790 net/minecraft/world/gen/feature/TwistingVinesFeatureConfig
FIELD field_35710 CODEC Lcom/mojang/serialization/Codec;