diff --git a/mappings/net/minecraft/world/gen/decorator/DecoratorContext.mapping b/mappings/net/minecraft/world/gen/feature/FeaturePlacementContext.mapping similarity index 91% rename from mappings/net/minecraft/world/gen/decorator/DecoratorContext.mapping rename to mappings/net/minecraft/world/gen/feature/FeaturePlacementContext.mapping index 99c888a748..be79846c64 100644 --- a/mappings/net/minecraft/world/gen/decorator/DecoratorContext.mapping +++ b/mappings/net/minecraft/world/gen/feature/FeaturePlacementContext.mapping @@ -1,4 +1,4 @@ -CLASS net/minecraft/class_5444 net/minecraft/world/gen/decorator/DecoratorContext +CLASS net/minecraft/class_5444 net/minecraft/world/gen/feature/FeaturePlacementContext FIELD field_25857 world Lnet/minecraft/class_5281; FIELD field_35734 generator Lnet/minecraft/class_2794; FIELD field_35735 placedFeature Ljava/util/Optional; diff --git a/mappings/net/minecraft/world/gen/decorator/RangeDecoratorConfig.mapping b/mappings/net/minecraft/world/gen/feature/RangeFeatureConfig.mapping similarity index 78% rename from mappings/net/minecraft/world/gen/decorator/RangeDecoratorConfig.mapping rename to mappings/net/minecraft/world/gen/feature/RangeFeatureConfig.mapping index 4251b4308b..9d42af8f4a 100644 --- a/mappings/net/minecraft/world/gen/decorator/RangeDecoratorConfig.mapping +++ b/mappings/net/minecraft/world/gen/feature/RangeFeatureConfig.mapping @@ -1,4 +1,4 @@ -CLASS net/minecraft/class_2997 net/minecraft/world/gen/decorator/RangeDecoratorConfig +CLASS net/minecraft/class_2997 net/minecraft/world/gen/feature/RangeFeatureConfig FIELD field_24879 CODEC Lcom/mojang/serialization/Codec; FIELD field_33519 heightProvider Lnet/minecraft/class_6122; METHOD (Lnet/minecraft/class_6122;)V diff --git a/mappings/net/minecraft/world/gen/decorator/AbstractConditionalPlacementModifier.mapping b/mappings/net/minecraft/world/gen/placementmodifier/AbstractConditionalPlacementModifier.mapping similarity index 57% rename from mappings/net/minecraft/world/gen/decorator/AbstractConditionalPlacementModifier.mapping rename to mappings/net/minecraft/world/gen/placementmodifier/AbstractConditionalPlacementModifier.mapping index 7431dcbbef..99e19676d7 100644 --- a/mappings/net/minecraft/world/gen/decorator/AbstractConditionalPlacementModifier.mapping +++ b/mappings/net/minecraft/world/gen/placementmodifier/AbstractConditionalPlacementModifier.mapping @@ -1,4 +1,4 @@ -CLASS net/minecraft/class_6661 net/minecraft/world/gen/decorator/AbstractConditionalPlacementModifier +CLASS net/minecraft/class_6661 net/minecraft/world/gen/placementmodifier/AbstractConditionalPlacementModifier METHOD method_38918 shouldPlace (Lnet/minecraft/class_5444;Ljava/util/Random;Lnet/minecraft/class_2338;)Z ARG 1 context ARG 2 random diff --git a/mappings/net/minecraft/world/gen/decorator/AbstractCountPlacementModifier.mapping b/mappings/net/minecraft/world/gen/placementmodifier/AbstractCountPlacementModifier.mapping similarity index 50% rename from mappings/net/minecraft/world/gen/decorator/AbstractCountPlacementModifier.mapping rename to mappings/net/minecraft/world/gen/placementmodifier/AbstractCountPlacementModifier.mapping index 98ee63d90e..e7412cc282 100644 --- a/mappings/net/minecraft/world/gen/decorator/AbstractCountPlacementModifier.mapping +++ b/mappings/net/minecraft/world/gen/placementmodifier/AbstractCountPlacementModifier.mapping @@ -1,4 +1,4 @@ -CLASS net/minecraft/class_5857 net/minecraft/world/gen/decorator/AbstractCountPlacementModifier +CLASS net/minecraft/class_5857 net/minecraft/world/gen/placementmodifier/AbstractCountPlacementModifier METHOD method_14452 getCount (Ljava/util/Random;Lnet/minecraft/class_2338;)I ARG 1 random ARG 2 pos diff --git a/mappings/net/minecraft/world/gen/decorator/BiomePlacementModifier.mapping b/mappings/net/minecraft/world/gen/placementmodifier/BiomePlacementModifier.mapping similarity index 64% rename from mappings/net/minecraft/world/gen/decorator/BiomePlacementModifier.mapping rename to mappings/net/minecraft/world/gen/placementmodifier/BiomePlacementModifier.mapping index 93923680d6..906e192848 100644 --- a/mappings/net/minecraft/world/gen/decorator/BiomePlacementModifier.mapping +++ b/mappings/net/minecraft/world/gen/placementmodifier/BiomePlacementModifier.mapping @@ -1,4 +1,4 @@ -CLASS net/minecraft/class_6792 net/minecraft/world/gen/decorator/BiomePlacementModifier +CLASS net/minecraft/class_6792 net/minecraft/world/gen/placementmodifier/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; diff --git a/mappings/net/minecraft/world/gen/decorator/BlockFilterPlacementModifier.mapping b/mappings/net/minecraft/world/gen/placementmodifier/BlockFilterPlacementModifier.mapping similarity index 73% rename from mappings/net/minecraft/world/gen/decorator/BlockFilterPlacementModifier.mapping rename to mappings/net/minecraft/world/gen/placementmodifier/BlockFilterPlacementModifier.mapping index 610032d989..401242bfa5 100644 --- a/mappings/net/minecraft/world/gen/decorator/BlockFilterPlacementModifier.mapping +++ b/mappings/net/minecraft/world/gen/placementmodifier/BlockFilterPlacementModifier.mapping @@ -1,4 +1,4 @@ -CLASS net/minecraft/class_6658 net/minecraft/world/gen/decorator/BlockFilterPlacementModifier +CLASS net/minecraft/class_6658 net/minecraft/world/gen/placementmodifier/BlockFilterPlacementModifier FIELD field_35075 MODIFIER_CODEC Lcom/mojang/serialization/Codec; FIELD field_35076 predicate Lnet/minecraft/class_6646; METHOD (Lnet/minecraft/class_6646;)V diff --git a/mappings/net/minecraft/world/gen/decorator/CarvingMaskPlacementModifier.mapping b/mappings/net/minecraft/world/gen/placementmodifier/CarvingMaskPlacementModifier.mapping similarity index 79% rename from mappings/net/minecraft/world/gen/decorator/CarvingMaskPlacementModifier.mapping rename to mappings/net/minecraft/world/gen/placementmodifier/CarvingMaskPlacementModifier.mapping index 27e0c09df5..b0ae9dd391 100644 --- a/mappings/net/minecraft/world/gen/decorator/CarvingMaskPlacementModifier.mapping +++ b/mappings/net/minecraft/world/gen/placementmodifier/CarvingMaskPlacementModifier.mapping @@ -1,4 +1,4 @@ -CLASS net/minecraft/class_5851 net/minecraft/world/gen/decorator/CarvingMaskPlacementModifier +CLASS net/minecraft/class_5851 net/minecraft/world/gen/placementmodifier/CarvingMaskPlacementModifier FIELD field_28934 MODIFIER_CODEC Lcom/mojang/serialization/Codec; FIELD field_28935 step Lnet/minecraft/class_2893$class_2894; METHOD (Lnet/minecraft/class_2893$class_2894;)V diff --git a/mappings/net/minecraft/world/gen/decorator/CountMultilayerPlacementModifier.mapping b/mappings/net/minecraft/world/gen/placementmodifier/CountMultilayerPlacementModifier.mapping similarity index 83% rename from mappings/net/minecraft/world/gen/decorator/CountMultilayerPlacementModifier.mapping rename to mappings/net/minecraft/world/gen/placementmodifier/CountMultilayerPlacementModifier.mapping index ae5563c392..18967e330c 100644 --- a/mappings/net/minecraft/world/gen/decorator/CountMultilayerPlacementModifier.mapping +++ b/mappings/net/minecraft/world/gen/placementmodifier/CountMultilayerPlacementModifier.mapping @@ -1,4 +1,4 @@ -CLASS net/minecraft/class_5452 net/minecraft/world/gen/decorator/CountMultilayerPlacementModifier +CLASS net/minecraft/class_5452 net/minecraft/world/gen/placementmodifier/CountMultilayerPlacementModifier FIELD field_35716 MODIFIER_CODEC Lcom/mojang/serialization/Codec; FIELD field_35717 count Lnet/minecraft/class_6017; METHOD (Lnet/minecraft/class_6017;)V diff --git a/mappings/net/minecraft/world/gen/decorator/CountPlacementModifier.mapping b/mappings/net/minecraft/world/gen/placementmodifier/CountPlacementModifier.mapping similarity index 77% rename from mappings/net/minecraft/world/gen/decorator/CountPlacementModifier.mapping rename to mappings/net/minecraft/world/gen/placementmodifier/CountPlacementModifier.mapping index b99be5f256..1fd72cf3fb 100644 --- a/mappings/net/minecraft/world/gen/decorator/CountPlacementModifier.mapping +++ b/mappings/net/minecraft/world/gen/placementmodifier/CountPlacementModifier.mapping @@ -1,4 +1,4 @@ -CLASS net/minecraft/class_6793 net/minecraft/world/gen/decorator/CountPlacementModifier +CLASS net/minecraft/class_6793 net/minecraft/world/gen/placementmodifier/CountPlacementModifier FIELD field_35718 MODIFIER_CODEC Lcom/mojang/serialization/Codec; FIELD field_35719 count Lnet/minecraft/class_6017; METHOD (Lnet/minecraft/class_6017;)V diff --git a/mappings/net/minecraft/world/gen/decorator/EnvironmentScanPlacementModifier.mapping b/mappings/net/minecraft/world/gen/placementmodifier/EnvironmentScanPlacementModifier.mapping similarity index 89% rename from mappings/net/minecraft/world/gen/decorator/EnvironmentScanPlacementModifier.mapping rename to mappings/net/minecraft/world/gen/placementmodifier/EnvironmentScanPlacementModifier.mapping index 4d7d52445a..ac26472078 100644 --- a/mappings/net/minecraft/world/gen/decorator/EnvironmentScanPlacementModifier.mapping +++ b/mappings/net/minecraft/world/gen/placementmodifier/EnvironmentScanPlacementModifier.mapping @@ -1,4 +1,4 @@ -CLASS net/minecraft/class_6794 net/minecraft/world/gen/decorator/EnvironmentScanPlacementModifier +CLASS net/minecraft/class_6794 net/minecraft/world/gen/placementmodifier/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; diff --git a/mappings/net/minecraft/world/gen/decorator/HeightRangePlacementModifier.mapping b/mappings/net/minecraft/world/gen/placementmodifier/HeightRangePlacementModifier.mapping similarity index 84% rename from mappings/net/minecraft/world/gen/decorator/HeightRangePlacementModifier.mapping rename to mappings/net/minecraft/world/gen/placementmodifier/HeightRangePlacementModifier.mapping index 7ecc053a27..4160870efa 100644 --- a/mappings/net/minecraft/world/gen/decorator/HeightRangePlacementModifier.mapping +++ b/mappings/net/minecraft/world/gen/placementmodifier/HeightRangePlacementModifier.mapping @@ -1,4 +1,4 @@ -CLASS net/minecraft/class_6795 net/minecraft/world/gen/decorator/HeightRangePlacementModifier +CLASS net/minecraft/class_6795 net/minecraft/world/gen/placementmodifier/HeightRangePlacementModifier FIELD field_35725 MODIFIER_CODEC Lcom/mojang/serialization/Codec; FIELD field_35726 height Lnet/minecraft/class_6122; METHOD (Lnet/minecraft/class_6122;)V diff --git a/mappings/net/minecraft/world/gen/decorator/HeightmapPlacementModifier.mapping b/mappings/net/minecraft/world/gen/placementmodifier/HeightmapPlacementModifier.mapping similarity index 81% rename from mappings/net/minecraft/world/gen/decorator/HeightmapPlacementModifier.mapping rename to mappings/net/minecraft/world/gen/placementmodifier/HeightmapPlacementModifier.mapping index 01275b1f73..cde0278b63 100644 --- a/mappings/net/minecraft/world/gen/decorator/HeightmapPlacementModifier.mapping +++ b/mappings/net/minecraft/world/gen/placementmodifier/HeightmapPlacementModifier.mapping @@ -1,4 +1,4 @@ -CLASS net/minecraft/class_5925 net/minecraft/world/gen/decorator/HeightmapPlacementModifier +CLASS net/minecraft/class_5925 net/minecraft/world/gen/placementmodifier/HeightmapPlacementModifier FIELD field_29265 MODIFIER_CODEC Lcom/mojang/serialization/Codec; FIELD field_29266 heightmap Lnet/minecraft/class_2902$class_2903; METHOD (Lnet/minecraft/class_2902$class_2903;)V diff --git a/mappings/net/minecraft/world/gen/decorator/NoiseBasedCountPlacementModifier.mapping b/mappings/net/minecraft/world/gen/placementmodifier/NoiseBasedCountPlacementModifier.mapping similarity index 82% rename from mappings/net/minecraft/world/gen/decorator/NoiseBasedCountPlacementModifier.mapping rename to mappings/net/minecraft/world/gen/placementmodifier/NoiseBasedCountPlacementModifier.mapping index 15f0deeb20..ec5531b27e 100644 --- a/mappings/net/minecraft/world/gen/decorator/NoiseBasedCountPlacementModifier.mapping +++ b/mappings/net/minecraft/world/gen/placementmodifier/NoiseBasedCountPlacementModifier.mapping @@ -1,4 +1,4 @@ -CLASS net/minecraft/class_3275 net/minecraft/world/gen/decorator/NoiseBasedCountPlacementModifier +CLASS net/minecraft/class_3275 net/minecraft/world/gen/placementmodifier/NoiseBasedCountPlacementModifier FIELD field_14205 noiseOffset D FIELD field_14206 noiseFactor D FIELD field_14208 noiseToCountRatio I diff --git a/mappings/net/minecraft/world/gen/decorator/NoiseThresholdCountPlacementModifier.mapping b/mappings/net/minecraft/world/gen/placementmodifier/NoiseThresholdCountPlacementModifier.mapping similarity index 81% rename from mappings/net/minecraft/world/gen/decorator/NoiseThresholdCountPlacementModifier.mapping rename to mappings/net/minecraft/world/gen/placementmodifier/NoiseThresholdCountPlacementModifier.mapping index 8b7dedbcd4..3861a01f22 100644 --- a/mappings/net/minecraft/world/gen/decorator/NoiseThresholdCountPlacementModifier.mapping +++ b/mappings/net/minecraft/world/gen/placementmodifier/NoiseThresholdCountPlacementModifier.mapping @@ -1,4 +1,4 @@ -CLASS net/minecraft/class_3003 net/minecraft/world/gen/decorator/NoiseThresholdCountPlacementModifier +CLASS net/minecraft/class_3003 net/minecraft/world/gen/placementmodifier/NoiseThresholdCountPlacementModifier FIELD field_13444 noiseLevel D FIELD field_13445 aboveNoise I FIELD field_13446 belowNoise I diff --git a/mappings/net/minecraft/world/gen/decorator/PlacementModifier.mapping b/mappings/net/minecraft/world/gen/placementmodifier/PlacementModifier.mapping similarity index 88% rename from mappings/net/minecraft/world/gen/decorator/PlacementModifier.mapping rename to mappings/net/minecraft/world/gen/placementmodifier/PlacementModifier.mapping index a58080f838..a9f1b7594d 100644 --- a/mappings/net/minecraft/world/gen/decorator/PlacementModifier.mapping +++ b/mappings/net/minecraft/world/gen/placementmodifier/PlacementModifier.mapping @@ -1,4 +1,4 @@ -CLASS net/minecraft/class_6797 net/minecraft/world/gen/decorator/PlacementModifier +CLASS net/minecraft/class_6797 net/minecraft/world/gen/placementmodifier/PlacementModifier COMMENT A placement modifier is a one-to-many position transformation, which COMMENT takes a position with some context and returns zero or more positions. COMMENT It's used to determine where to generate configured features. diff --git a/mappings/net/minecraft/world/gen/decorator/PlacementModifierType.mapping b/mappings/net/minecraft/world/gen/placementmodifier/PlacementModifierType.mapping similarity index 58% rename from mappings/net/minecraft/world/gen/decorator/PlacementModifierType.mapping rename to mappings/net/minecraft/world/gen/placementmodifier/PlacementModifierType.mapping index 31390d6b5f..273a09b0c5 100644 --- a/mappings/net/minecraft/world/gen/decorator/PlacementModifierType.mapping +++ b/mappings/net/minecraft/world/gen/placementmodifier/PlacementModifierType.mapping @@ -1,4 +1,4 @@ -CLASS net/minecraft/class_6798 net/minecraft/world/gen/decorator/PlacementModifierType +CLASS net/minecraft/class_6798 net/minecraft/world/gen/placementmodifier/PlacementModifierType METHOD method_39655 register (Ljava/lang/String;Lcom/mojang/serialization/Codec;)Lnet/minecraft/class_6798; ARG 0 id ARG 1 codec diff --git a/mappings/net/minecraft/world/gen/decorator/RandomOffsetPlacementModifier.mapping b/mappings/net/minecraft/world/gen/placementmodifier/RandomOffsetPlacementModifier.mapping similarity index 85% rename from mappings/net/minecraft/world/gen/decorator/RandomOffsetPlacementModifier.mapping rename to mappings/net/minecraft/world/gen/placementmodifier/RandomOffsetPlacementModifier.mapping index 584027c70f..cec4188aac 100644 --- a/mappings/net/minecraft/world/gen/decorator/RandomOffsetPlacementModifier.mapping +++ b/mappings/net/minecraft/world/gen/placementmodifier/RandomOffsetPlacementModifier.mapping @@ -1,4 +1,4 @@ -CLASS net/minecraft/class_6732 net/minecraft/world/gen/decorator/RandomOffsetPlacementModifier +CLASS net/minecraft/class_6732 net/minecraft/world/gen/placementmodifier/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; diff --git a/mappings/net/minecraft/world/gen/decorator/RarityFilterPlacementModifier.mapping b/mappings/net/minecraft/world/gen/placementmodifier/RarityFilterPlacementModifier.mapping similarity index 65% rename from mappings/net/minecraft/world/gen/decorator/RarityFilterPlacementModifier.mapping rename to mappings/net/minecraft/world/gen/placementmodifier/RarityFilterPlacementModifier.mapping index b3b874fe9d..47b2903124 100644 --- a/mappings/net/minecraft/world/gen/decorator/RarityFilterPlacementModifier.mapping +++ b/mappings/net/minecraft/world/gen/placementmodifier/RarityFilterPlacementModifier.mapping @@ -1,4 +1,4 @@ -CLASS net/minecraft/class_6799 net/minecraft/world/gen/decorator/RarityFilterPlacementModifier +CLASS net/minecraft/class_6799 net/minecraft/world/gen/placementmodifier/RarityFilterPlacementModifier FIELD field_35752 MODIFIER_CODEC Lcom/mojang/serialization/Codec; FIELD field_35753 chance I METHOD (I)V diff --git a/mappings/net/minecraft/world/gen/decorator/SquarePlacementModifier.mapping b/mappings/net/minecraft/world/gen/placementmodifier/SquarePlacementModifier.mapping similarity index 64% rename from mappings/net/minecraft/world/gen/decorator/SquarePlacementModifier.mapping rename to mappings/net/minecraft/world/gen/placementmodifier/SquarePlacementModifier.mapping index 44d1598745..dc4d8e243d 100644 --- a/mappings/net/minecraft/world/gen/decorator/SquarePlacementModifier.mapping +++ b/mappings/net/minecraft/world/gen/placementmodifier/SquarePlacementModifier.mapping @@ -1,4 +1,4 @@ -CLASS net/minecraft/class_5450 net/minecraft/world/gen/decorator/SquarePlacementModifier +CLASS net/minecraft/class_5450 net/minecraft/world/gen/placementmodifier/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; diff --git a/mappings/net/minecraft/world/gen/decorator/SurfaceThresholdFilterPlacementModifier.mapping b/mappings/net/minecraft/world/gen/placementmodifier/SurfaceThresholdFilterPlacementModifier.mapping similarity index 78% rename from mappings/net/minecraft/world/gen/decorator/SurfaceThresholdFilterPlacementModifier.mapping rename to mappings/net/minecraft/world/gen/placementmodifier/SurfaceThresholdFilterPlacementModifier.mapping index efd264acff..a36e6b7b6a 100644 --- a/mappings/net/minecraft/world/gen/decorator/SurfaceThresholdFilterPlacementModifier.mapping +++ b/mappings/net/minecraft/world/gen/placementmodifier/SurfaceThresholdFilterPlacementModifier.mapping @@ -1,4 +1,4 @@ -CLASS net/minecraft/class_6584 net/minecraft/world/gen/decorator/SurfaceThresholdFilterPlacementModifier +CLASS net/minecraft/class_6584 net/minecraft/world/gen/placementmodifier/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 diff --git a/mappings/net/minecraft/world/gen/decorator/SurfaceWaterDepthFilterPlacementModifier.mapping b/mappings/net/minecraft/world/gen/placementmodifier/SurfaceWaterDepthFilterPlacementModifier.mapping similarity index 75% rename from mappings/net/minecraft/world/gen/decorator/SurfaceWaterDepthFilterPlacementModifier.mapping rename to mappings/net/minecraft/world/gen/placementmodifier/SurfaceWaterDepthFilterPlacementModifier.mapping index eb0ad89ebd..a1cbe1b79c 100644 --- a/mappings/net/minecraft/world/gen/decorator/SurfaceWaterDepthFilterPlacementModifier.mapping +++ b/mappings/net/minecraft/world/gen/placementmodifier/SurfaceWaterDepthFilterPlacementModifier.mapping @@ -1,4 +1,4 @@ -CLASS net/minecraft/class_5934 net/minecraft/world/gen/decorator/SurfaceWaterDepthFilterPlacementModifier +CLASS net/minecraft/class_5934 net/minecraft/world/gen/placementmodifier/SurfaceWaterDepthFilterPlacementModifier FIELD field_29323 MODIFIER_CODEC Lcom/mojang/serialization/Codec; FIELD field_29324 maxWaterDepth I METHOD (I)V