From 5b8943ee104e5d9dbab5cd50186a3eb091ba95c6 Mon Sep 17 00:00:00 2001 From: SuperCoder79 <25208576+SuperCoder7979@users.noreply.github.com> Date: Tue, 9 Mar 2021 14:52:29 -0500 Subject: [PATCH] 21w08b worldgen mappings (#2116) * 21w08b worldgen mappings * Apply suggestions from code review Co-authored-by: YanisBft * Apply suggestions from code review Co-authored-by: liach <7806504+liach@users.noreply.github.com> * Apply suggestions from code review Co-authored-by: enbrain <69905075+enbrain@users.noreply.github.com> * Update mappings/net/minecraft/world/gen/feature/Feature.mapping Co-authored-by: liach <7806504+liach@users.noreply.github.com> Co-authored-by: YanisBft Co-authored-by: liach <7806504+liach@users.noreply.github.com> Co-authored-by: enbrain <69905075+enbrain@users.noreply.github.com> --- .../minecraft/structure/rule/RuleTest.mapping | 1 + .../net/minecraft/util/math/ChunkPos.mapping | 8 ++++ .../ClampedNormalFloatProvider.mapping | 24 +++++++++++ .../ConstantFloatProvider.mapping | 11 +++++ .../math/floatprovider/FloatProvider.mapping | 13 ++++++ .../floatprovider/FloatProviderType.mapping | 4 ++ .../TrapezoidFloatProvider.mapping | 15 +++++++ .../UniformFloatProvider.mapping | 12 ++++++ ...pping => InterpolatedNoiseSampler.mapping} | 2 +- .../minecraft/util/registry/Registry.mapping | 1 + .../minecraft/world/ChunkSectionCache.mapping | 13 ++++++ ...yer.mapping => AddBaseBiomesLayer.mapping} | 2 +- ...sLayer.mapping => ApplyRiverLayer.mapping} | 2 +- .../biome/layer/EaseBiomeEdgeLayer.mapping | 2 +- .../world/gen/AquiferSampler.mapping | 10 +++++ .../world/gen/GeneratorOptions.mapping | 4 ++ .../world/gen/NoiseCaveSampler.mapping | 16 ++++---- .../minecraft/world/gen/carver/Carver.mapping | 25 +++++++++++- .../world/gen/carver/CaveCarver.mapping | 15 +++++++ .../world/gen/carver/ConfiguredCarver.mapping | 8 ++++ .../world/gen/carver/RavineCarver.mapping | 40 +++++++++++++++++++ .../gen/chunk/NoiseChunkGenerator.mapping | 1 + ...ature.mapping => BlockPileFeature.mapping} | 4 +- .../gen/feature/ConfiguredFeatures.mapping | 14 +++++++ .../world/gen/feature/CoralFeature.mapping | 4 +- .../world/gen/feature/DeltaFeature.mapping | 4 ++ .../world/gen/feature/Feature.mapping | 7 ++++ .../world/gen/feature/OreFeature.mapping | 10 +++++ .../gen/feature/OreFeatureConfig.mapping | 30 ++++++++++++++ .../gen/feature/ScatteredOreFeature.mapping | 9 +++++ .../AlterGroundTreeDecorator.mapping | 2 +- .../BeehiveTreeDecorator.mapping | 2 +- .../CocoaBeansTreeDecorator.mapping | 2 +- .../LeavesVineTreeDecorator.mapping | 2 +- .../TreeDecorator.mapping | 2 +- .../TreeDecoratorType.mapping | 2 +- .../TrunkVineTreeDecorator.mapping | 2 +- 37 files changed, 301 insertions(+), 24 deletions(-) create mode 100644 mappings/net/minecraft/util/math/floatprovider/ClampedNormalFloatProvider.mapping create mode 100644 mappings/net/minecraft/util/math/floatprovider/ConstantFloatProvider.mapping create mode 100644 mappings/net/minecraft/util/math/floatprovider/FloatProvider.mapping create mode 100644 mappings/net/minecraft/util/math/floatprovider/FloatProviderType.mapping create mode 100644 mappings/net/minecraft/util/math/floatprovider/TrapezoidFloatProvider.mapping create mode 100644 mappings/net/minecraft/util/math/floatprovider/UniformFloatProvider.mapping rename mappings/net/minecraft/util/math/noise/{InterpolatedNoise.mapping => InterpolatedNoiseSampler.mapping} (96%) create mode 100644 mappings/net/minecraft/world/ChunkSectionCache.mapping rename mappings/net/minecraft/world/biome/layer/{SetBaseBiomesLayer.mapping => AddBaseBiomesLayer.mapping} (74%) rename mappings/net/minecraft/world/biome/layer/{AddRiversLayer.mapping => ApplyRiverLayer.mapping} (81%) rename mappings/net/minecraft/world/gen/feature/{AbstractPileFeature.mapping => BlockPileFeature.mapping} (54%) create mode 100644 mappings/net/minecraft/world/gen/feature/ScatteredOreFeature.mapping rename mappings/net/minecraft/world/gen/{tree => treedecorator}/AlterGroundTreeDecorator.mapping (87%) rename mappings/net/minecraft/world/gen/{tree => treedecorator}/BeehiveTreeDecorator.mapping (75%) rename mappings/net/minecraft/world/gen/{tree => treedecorator}/CocoaBeansTreeDecorator.mapping (78%) rename mappings/net/minecraft/world/gen/{tree => treedecorator}/LeavesVineTreeDecorator.mapping (86%) rename mappings/net/minecraft/world/gen/{tree => treedecorator}/TreeDecorator.mapping (92%) rename mappings/net/minecraft/world/gen/{tree => treedecorator}/TreeDecoratorType.mapping (78%) rename mappings/net/minecraft/world/gen/{tree => treedecorator}/TrunkVineTreeDecorator.mapping (73%) diff --git a/mappings/net/minecraft/structure/rule/RuleTest.mapping b/mappings/net/minecraft/structure/rule/RuleTest.mapping index 2eaf86d5a7..8700c0f74f 100644 --- a/mappings/net/minecraft/structure/rule/RuleTest.mapping +++ b/mappings/net/minecraft/structure/rule/RuleTest.mapping @@ -1,5 +1,6 @@ CLASS net/minecraft/class_3825 net/minecraft/structure/rule/RuleTest COMMENT Rule tests are used in structure generation to check if a block state matches some condition. + FIELD field_25012 TYPE_CODEC Lcom/mojang/serialization/Codec; METHOD method_16766 getType ()Lnet/minecraft/class_3827; METHOD method_16768 test (Lnet/minecraft/class_2680;Ljava/util/Random;)Z ARG 1 state diff --git a/mappings/net/minecraft/util/math/ChunkPos.mapping b/mappings/net/minecraft/util/math/ChunkPos.mapping index 593a83d59f..3fc7fb21f0 100644 --- a/mappings/net/minecraft/util/math/ChunkPos.mapping +++ b/mappings/net/minecraft/util/math/ChunkPos.mapping @@ -23,6 +23,14 @@ CLASS net/minecraft/class_1923 net/minecraft/util/math/ChunkPos ARG 1 pos2 METHOD method_24022 getChebyshevDistance (Lnet/minecraft/class_1923;)I ARG 1 pos + METHOD method_33939 getOffsetX (I)I + ARG 1 offset + METHOD method_33940 getCenterX ()I + METHOD method_33941 getOffsetZ (I)I + ARG 1 offset + METHOD method_33942 getCenterZ ()I + METHOD method_33943 getCenterAtY (I)Lnet/minecraft/class_2338; + ARG 1 y METHOD method_8323 getStartPos ()Lnet/minecraft/class_2338; METHOD method_8324 toLong ()J METHOD method_8325 getPackedX (J)I diff --git a/mappings/net/minecraft/util/math/floatprovider/ClampedNormalFloatProvider.mapping b/mappings/net/minecraft/util/math/floatprovider/ClampedNormalFloatProvider.mapping new file mode 100644 index 0000000000..1434a78358 --- /dev/null +++ b/mappings/net/minecraft/util/math/floatprovider/ClampedNormalFloatProvider.mapping @@ -0,0 +1,24 @@ +CLASS net/minecraft/class_5861 net/minecraft/util/math/floatprovider/ClampedNormalFloatProvider + FIELD field_28998 CODEC Lcom/mojang/serialization/Codec; + FIELD field_28999 mean F + FIELD field_29000 deviation F + FIELD field_29001 min F + FIELD field_29002 max F + METHOD (FFFF)V + ARG 1 mean + ARG 2 deviation + ARG 3 min + ARG 4 max + METHOD equals (Ljava/lang/Object;)Z + ARG 1 object + METHOD method_33900 create (FFFF)Lnet/minecraft/class_5861; + ARG 0 mean + ARG 1 deviation + ARG 2 min + ARG 3 max + METHOD method_33903 get (Ljava/util/Random;FFFF)F + ARG 0 random + ARG 1 mean + ARG 2 deviation + ARG 3 min + ARG 4 max diff --git a/mappings/net/minecraft/util/math/floatprovider/ConstantFloatProvider.mapping b/mappings/net/minecraft/util/math/floatprovider/ConstantFloatProvider.mapping new file mode 100644 index 0000000000..6e5de7e485 --- /dev/null +++ b/mappings/net/minecraft/util/math/floatprovider/ConstantFloatProvider.mapping @@ -0,0 +1,11 @@ +CLASS net/minecraft/class_5862 net/minecraft/util/math/floatprovider/ConstantFloatProvider + FIELD field_29003 ZERO Lnet/minecraft/class_5862; + FIELD field_29004 CODEC Lcom/mojang/serialization/Codec; + FIELD field_29005 value F + METHOD (F)V + ARG 1 value + METHOD equals (Ljava/lang/Object;)Z + ARG 1 object + METHOD method_33908 create (F)Lnet/minecraft/class_5862; + ARG 0 value + METHOD method_33914 getValue ()F diff --git a/mappings/net/minecraft/util/math/floatprovider/FloatProvider.mapping b/mappings/net/minecraft/util/math/floatprovider/FloatProvider.mapping new file mode 100644 index 0000000000..223da3578b --- /dev/null +++ b/mappings/net/minecraft/util/math/floatprovider/FloatProvider.mapping @@ -0,0 +1,13 @@ +CLASS net/minecraft/class_5863 net/minecraft/util/math/floatprovider/FloatProvider + FIELD field_29006 FLOAT_CODEC Lcom/mojang/serialization/Codec; + FIELD field_29007 VALUE_CODEC Lcom/mojang/serialization/Codec; + METHOD method_33915 getMin ()F + METHOD method_33916 createValidatedCodec (FF)Lcom/mojang/serialization/Codec; + ARG 0 min + ARG 1 max + METHOD method_33917 (FFLnet/minecraft/class_5863;)Lcom/mojang/serialization/DataResult; + ARG 2 provider + METHOD method_33920 get (Ljava/util/Random;)F + ARG 1 random + METHOD method_33921 getMax ()F + METHOD method_33923 getType ()Lnet/minecraft/class_5864; diff --git a/mappings/net/minecraft/util/math/floatprovider/FloatProviderType.mapping b/mappings/net/minecraft/util/math/floatprovider/FloatProviderType.mapping new file mode 100644 index 0000000000..bf2d0463a6 --- /dev/null +++ b/mappings/net/minecraft/util/math/floatprovider/FloatProviderType.mapping @@ -0,0 +1,4 @@ +CLASS net/minecraft/class_5864 net/minecraft/util/math/floatprovider/FloatProviderType + METHOD method_33925 register (Ljava/lang/String;Lcom/mojang/serialization/Codec;)Lnet/minecraft/class_5864; + ARG 0 id + ARG 1 codec diff --git a/mappings/net/minecraft/util/math/floatprovider/TrapezoidFloatProvider.mapping b/mappings/net/minecraft/util/math/floatprovider/TrapezoidFloatProvider.mapping new file mode 100644 index 0000000000..7807b34c5c --- /dev/null +++ b/mappings/net/minecraft/util/math/floatprovider/TrapezoidFloatProvider.mapping @@ -0,0 +1,15 @@ +CLASS net/minecraft/class_5865 net/minecraft/util/math/floatprovider/TrapezoidFloatProvider + FIELD field_29012 CODEC Lcom/mojang/serialization/Codec; + FIELD field_29013 min F + FIELD field_29014 max F + FIELD field_29015 plateau F + METHOD (FFF)V + ARG 1 min + ARG 2 max + ARG 3 plateau + METHOD equals (Ljava/lang/Object;)Z + ARG 1 object + METHOD method_33926 create (FFF)Lnet/minecraft/class_5865; + ARG 0 min + ARG 1 max + ARG 2 plateau diff --git a/mappings/net/minecraft/util/math/floatprovider/UniformFloatProvider.mapping b/mappings/net/minecraft/util/math/floatprovider/UniformFloatProvider.mapping new file mode 100644 index 0000000000..7d54b38b2c --- /dev/null +++ b/mappings/net/minecraft/util/math/floatprovider/UniformFloatProvider.mapping @@ -0,0 +1,12 @@ +CLASS net/minecraft/class_5866 net/minecraft/util/math/floatprovider/UniformFloatProvider + FIELD field_29016 CODEC Lcom/mojang/serialization/Codec; + FIELD field_29017 base F + FIELD field_29018 spread F + METHOD (FF)V + ARG 1 base + ARG 2 spread + METHOD equals (Ljava/lang/Object;)Z + ARG 1 object + METHOD method_33934 create (FF)Lnet/minecraft/class_5866; + ARG 0 base + ARG 1 spread diff --git a/mappings/net/minecraft/util/math/noise/InterpolatedNoise.mapping b/mappings/net/minecraft/util/math/noise/InterpolatedNoiseSampler.mapping similarity index 96% rename from mappings/net/minecraft/util/math/noise/InterpolatedNoise.mapping rename to mappings/net/minecraft/util/math/noise/InterpolatedNoiseSampler.mapping index 876cd393fe..50e0363583 100644 --- a/mappings/net/minecraft/util/math/noise/InterpolatedNoise.mapping +++ b/mappings/net/minecraft/util/math/noise/InterpolatedNoiseSampler.mapping @@ -1,4 +1,4 @@ -CLASS net/minecraft/class_5822 net/minecraft/util/math/noise/InterpolatedNoise +CLASS net/minecraft/class_5822 net/minecraft/util/math/noise/InterpolatedNoiseSampler FIELD field_28774 lowerInterpolatedNoise Lnet/minecraft/class_3537; FIELD field_28775 upperInterpolatedNoise Lnet/minecraft/class_3537; FIELD field_28776 interpolationNoise Lnet/minecraft/class_3537; diff --git a/mappings/net/minecraft/util/registry/Registry.mapping b/mappings/net/minecraft/util/registry/Registry.mapping index d71b39a583..53c0c7997f 100644 --- a/mappings/net/minecraft/util/registry/Registry.mapping +++ b/mappings/net/minecraft/util/registry/Registry.mapping @@ -112,6 +112,7 @@ CLASS net/minecraft/class_2378 net/minecraft/util/registry/Registry FIELD field_28264 GAME_EVENT Lnet/minecraft/class_2348; FIELD field_28265 POSITION_SOURCE_TYPE Lnet/minecraft/class_2378; FIELD field_28266 GAME_EVENT_KEY Lnet/minecraft/class_5321; + FIELD field_29076 FLOAT_PROVIDER_TYPE Lnet/minecraft/class_2378; METHOD (Lnet/minecraft/class_5321;Lcom/mojang/serialization/Lifecycle;)V ARG 1 key ARG 2 lifecycle diff --git a/mappings/net/minecraft/world/ChunkSectionCache.mapping b/mappings/net/minecraft/world/ChunkSectionCache.mapping new file mode 100644 index 0000000000..aa9449da67 --- /dev/null +++ b/mappings/net/minecraft/world/ChunkSectionCache.mapping @@ -0,0 +1,13 @@ +CLASS net/minecraft/class_5867 net/minecraft/world/ChunkSectionCache + FIELD field_29037 world Lnet/minecraft/class_1936; + FIELD field_29038 cache Lit/unimi/dsi/fastutil/longs/Long2ObjectMap; + FIELD field_29039 cachedSection Lnet/minecraft/class_2826; + FIELD field_29040 sectionPos J + METHOD (Lnet/minecraft/class_1936;)V + ARG 1 world + METHOD method_33944 getSection (Lnet/minecraft/class_2338;)Lnet/minecraft/class_2826; + ARG 1 pos + METHOD method_33945 (Lnet/minecraft/class_2338;J)Lnet/minecraft/class_2826; + ARG 2 cachedPos + METHOD method_33946 getBlockState (Lnet/minecraft/class_2338;)Lnet/minecraft/class_2680; + ARG 1 pos diff --git a/mappings/net/minecraft/world/biome/layer/SetBaseBiomesLayer.mapping b/mappings/net/minecraft/world/biome/layer/AddBaseBiomesLayer.mapping similarity index 74% rename from mappings/net/minecraft/world/biome/layer/SetBaseBiomesLayer.mapping rename to mappings/net/minecraft/world/biome/layer/AddBaseBiomesLayer.mapping index da29922ac6..d7ba404645 100644 --- a/mappings/net/minecraft/world/biome/layer/SetBaseBiomesLayer.mapping +++ b/mappings/net/minecraft/world/biome/layer/AddBaseBiomesLayer.mapping @@ -1,4 +1,4 @@ -CLASS net/minecraft/class_3640 net/minecraft/world/biome/layer/SetBaseBiomesLayer +CLASS net/minecraft/class_3640 net/minecraft/world/biome/layer/AddBaseBiomesLayer FIELD field_16062 TEMPERATE_BIOMES [I FIELD field_16064 DRY_BIOMES [I FIELD field_16066 SNOWY_BIOMES [I diff --git a/mappings/net/minecraft/world/biome/layer/AddRiversLayer.mapping b/mappings/net/minecraft/world/biome/layer/ApplyRiverLayer.mapping similarity index 81% rename from mappings/net/minecraft/world/biome/layer/AddRiversLayer.mapping rename to mappings/net/minecraft/world/biome/layer/ApplyRiverLayer.mapping index 5683855491..e13c24dc6b 100644 --- a/mappings/net/minecraft/world/biome/layer/AddRiversLayer.mapping +++ b/mappings/net/minecraft/world/biome/layer/ApplyRiverLayer.mapping @@ -1 +1 @@ -CLASS net/minecraft/class_3652 net/minecraft/world/biome/layer/AddRiversLayer +CLASS net/minecraft/class_3652 net/minecraft/world/biome/layer/ApplyRiverLayer diff --git a/mappings/net/minecraft/world/biome/layer/EaseBiomeEdgeLayer.mapping b/mappings/net/minecraft/world/biome/layer/EaseBiomeEdgeLayer.mapping index ca6d6d9225..7ba153079c 100644 --- a/mappings/net/minecraft/world/biome/layer/EaseBiomeEdgeLayer.mapping +++ b/mappings/net/minecraft/world/biome/layer/EaseBiomeEdgeLayer.mapping @@ -8,6 +8,6 @@ CLASS net/minecraft/class_3641 net/minecraft/world/biome/layer/EaseBiomeEdgeLaye ARG 6 center ARG 7 id1 ARG 8 id2 - METHOD method_15841 isMountain ([II)Z + METHOD method_15841 isMountainBiome ([II)Z ARG 1 ids ARG 2 id diff --git a/mappings/net/minecraft/world/gen/AquiferSampler.mapping b/mappings/net/minecraft/world/gen/AquiferSampler.mapping index 8e0deaf941..65cede6326 100644 --- a/mappings/net/minecraft/world/gen/AquiferSampler.mapping +++ b/mappings/net/minecraft/world/gen/AquiferSampler.mapping @@ -1,4 +1,5 @@ CLASS net/minecraft/class_5832 net/minecraft/world/gen/AquiferSampler + FIELD field_28813 edgeDensityNoise Lnet/minecraft/class_5216; FIELD field_28814 waterLevelNoise Lnet/minecraft/class_5216; FIELD field_28815 settings Lnet/minecraft/class_5284; FIELD field_28816 waterLevels [I @@ -15,6 +16,7 @@ CLASS net/minecraft/class_5832 net/minecraft/world/gen/AquiferSampler METHOD (IILnet/minecraft/class_5216;Lnet/minecraft/class_5216;Lnet/minecraft/class_5284;Lnet/minecraft/class_5818;I)V ARG 1 x ARG 2 z + ARG 3 edgeDensityNoise ARG 4 waterLevelNoise ARG 5 settings ARG 6 columnSampler @@ -22,6 +24,14 @@ CLASS net/minecraft/class_5832 net/minecraft/world/gen/AquiferSampler METHOD method_33733 getWaterLevel ()I METHOD method_33734 getLocalX (I)I ARG 1 x + METHOD method_33735 calculateDensity (IDII)D + ARG 1 y + ARG 2 noise + ARG 4 a + ARG 5 b + METHOD method_33736 maxDistance (II)D + ARG 1 a + ARG 2 b METHOD method_33737 apply (III)V ARG 1 x ARG 2 y diff --git a/mappings/net/minecraft/world/gen/GeneratorOptions.mapping b/mappings/net/minecraft/world/gen/GeneratorOptions.mapping index 6c5f8af806..c414af5d36 100644 --- a/mappings/net/minecraft/world/gen/GeneratorOptions.mapping +++ b/mappings/net/minecraft/world/gen/GeneratorOptions.mapping @@ -19,6 +19,8 @@ CLASS net/minecraft/class_5285 net/minecraft/world/gen/GeneratorOptions ARG 6 legacyCustomOptions METHOD method_28009 getDefaultOptions (Lnet/minecraft/class_2378;Lnet/minecraft/class_2378;Lnet/minecraft/class_2378;)Lnet/minecraft/class_5285; METHOD method_28021 fromProperties (Lnet/minecraft/class_5455;Ljava/util/Properties;)Lnet/minecraft/class_5285; + ARG 0 registryManager + ARG 1 properties METHOD method_28024 withHardcore (ZLjava/util/OptionalLong;)Lnet/minecraft/class_5285; ARG 1 hardcore ARG 2 seed @@ -40,3 +42,5 @@ CLASS net/minecraft/class_5285 net/minecraft/world/gen/GeneratorOptions METHOD method_28610 validate ()Lcom/mojang/serialization/DataResult; METHOD method_28611 isStable ()Z METHOD method_29575 getWorlds ()Lcom/google/common/collect/ImmutableSet; + METHOD method_31112 createDemo (Lnet/minecraft/class_5455;)Lnet/minecraft/class_5285; + ARG 0 registryManager diff --git a/mappings/net/minecraft/world/gen/NoiseCaveSampler.mapping b/mappings/net/minecraft/world/gen/NoiseCaveSampler.mapping index 2f0aa2ddc4..84fc39ea57 100644 --- a/mappings/net/minecraft/world/gen/NoiseCaveSampler.mapping +++ b/mappings/net/minecraft/world/gen/NoiseCaveSampler.mapping @@ -1,13 +1,13 @@ CLASS net/minecraft/class_5833 net/minecraft/world/gen/NoiseCaveSampler FIELD field_28827 minY I - FIELD field_28828 verticalOffsetNoise Lnet/minecraft/class_5216; - FIELD field_28829 verticalAdditionNoise Lnet/minecraft/class_5216; - FIELD field_28830 falloffNoise Lnet/minecraft/class_5216; - FIELD field_28831 pow3AdditionNoise Lnet/minecraft/class_5216; + FIELD field_28828 terrainAdditionNoise Lnet/minecraft/class_5216; + FIELD field_28829 pillarNoise Lnet/minecraft/class_5216; + FIELD field_28830 pillarFalloffNoise Lnet/minecraft/class_5216; + FIELD field_28831 pillarScaleNoise Lnet/minecraft/class_5216; FIELD field_28832 scaledCaveScaleNoise Lnet/minecraft/class_5216; FIELD field_28833 horizontalCaveNoise Lnet/minecraft/class_5216; FIELD field_28834 caveScaleNoise Lnet/minecraft/class_5216; - FIELD field_28835 caveExtentNoise Lnet/minecraft/class_5216; + FIELD field_28835 caveFalloffNoise Lnet/minecraft/class_5216; FIELD field_28836 tunnelNoise1 Lnet/minecraft/class_5216; FIELD field_28837 tunnelNoise2 Lnet/minecraft/class_5216; FIELD field_28838 tunnelScaleNoise Lnet/minecraft/class_5216; @@ -17,7 +17,7 @@ CLASS net/minecraft/class_5833 net/minecraft/world/gen/NoiseCaveSampler METHOD (Lnet/minecraft/class_5819;I)V ARG 1 random ARG 2 minY - METHOD method_33746 getAdditionNoise (III)D + METHOD method_33746 getPillarNoise (III)D ARG 1 x ARG 2 y ARG 3 z @@ -35,7 +35,7 @@ CLASS net/minecraft/class_5833 net/minecraft/world/gen/NoiseCaveSampler ARG 7 scale METHOD method_33749 clamp (D)D ARG 0 value - METHOD method_33750 getVerticalNoise (III)D + METHOD method_33750 getTerrainAdditionNoise (III)D ARG 1 x ARG 2 y ARG 3 z @@ -47,7 +47,7 @@ CLASS net/minecraft/class_5833 net/minecraft/world/gen/NoiseCaveSampler ARG 1 x ARG 2 y ARG 3 z - METHOD method_33753 getOffsetNoise (III)D + METHOD method_33753 getTunnelOffsetNoise (III)D ARG 1 x ARG 2 y ARG 3 z diff --git a/mappings/net/minecraft/world/gen/carver/Carver.mapping b/mappings/net/minecraft/world/gen/carver/Carver.mapping index 8b7698cd77..1ec7d1405f 100644 --- a/mappings/net/minecraft/world/gen/carver/Carver.mapping +++ b/mappings/net/minecraft/world/gen/carver/Carver.mapping @@ -28,6 +28,12 @@ CLASS net/minecraft/class_2939 net/minecraft/world/gen/carver/Carver ARG 1 config ARG 2 random METHOD method_12706 isOnBoundary (IIIIII)Z + ARG 0 x + ARG 1 z + ARG 2 minX + ARG 3 maxX + ARG 4 minZ + ARG 5 maxZ METHOD method_12709 canAlwaysCarveBlock (Lnet/minecraft/class_2680;)Z ARG 1 state METHOD method_12710 getBranchFactor ()I @@ -45,16 +51,33 @@ CLASS net/minecraft/class_2939 net/minecraft/world/gen/carver/Carver METHOD method_28614 configure (Lnet/minecraft/class_5871;)Lnet/minecraft/class_2922; ARG 1 config METHOD method_28616 getCodec ()Lcom/mojang/serialization/Codec; - METHOD method_33976 (Lnet/minecraft/class_1923;DDIIF)Z + METHOD method_33976 canCarveBranch (Lnet/minecraft/class_1923;DDIIF)Z ARG 0 pos + ARG 1 x + ARG 3 z + ARG 5 branchIndex + ARG 6 branchCount + ARG 7 baseWidth METHOD method_33977 isRegionUncarvable (Lnet/minecraft/class_2791;IIIIII)Z ARG 1 chunk + ARG 2 minX + ARG 3 maxX + ARG 4 minY + ARG 5 maxY + ARG 6 minZ + ARG 7 maxZ METHOD method_33978 carveRegion (Lnet/minecraft/class_5873;Lnet/minecraft/class_5871;Lnet/minecraft/class_2791;Ljava/util/function/Function;JIDDDDDLjava/util/BitSet;Lnet/minecraft/class_2939$class_5874;)Z ARG 1 context ARG 2 config ARG 3 chunk ARG 4 posToBiome ARG 5 seed + ARG 7 seaLevel + ARG 8 x + ARG 10 y + ARG 12 z + ARG 14 horizontalScale + ARG 16 verticalScale ARG 18 carvingMask ARG 19 skipPredicate METHOD method_33979 getState (Lnet/minecraft/class_5871;)Lnet/minecraft/class_2680; diff --git a/mappings/net/minecraft/world/gen/carver/CaveCarver.mapping b/mappings/net/minecraft/world/gen/carver/CaveCarver.mapping index 9108d92000..1ec5c117da 100644 --- a/mappings/net/minecraft/world/gen/carver/CaveCarver.mapping +++ b/mappings/net/minecraft/world/gen/carver/CaveCarver.mapping @@ -17,7 +17,22 @@ CLASS net/minecraft/class_2925 net/minecraft/world/gen/carver/CaveCarver ARG 1 context ARG 2 config ARG 3 chunk + ARG 4 posToBiome + ARG 5 seed ARG 7 seaLevel + ARG 8 x + ARG 10 y + ARG 12 z + ARG 14 horizontalScale + ARG 16 verticalScale + ARG 18 width + ARG 19 yaw + ARG 20 pitch + ARG 21 branchStartIndex + ARG 22 branchCount + ARG 23 yawPitchRatio + ARG 25 carvingMask + ARG 26 skipPredicate METHOD method_16576 getTunnelSystemWidth (Ljava/util/Random;)F ARG 1 random METHOD method_16577 getMaxCaveCount ()I diff --git a/mappings/net/minecraft/world/gen/carver/ConfiguredCarver.mapping b/mappings/net/minecraft/world/gen/carver/ConfiguredCarver.mapping index dfa147ff31..5c5c0176bd 100644 --- a/mappings/net/minecraft/world/gen/carver/ConfiguredCarver.mapping +++ b/mappings/net/minecraft/world/gen/carver/ConfiguredCarver.mapping @@ -3,10 +3,18 @@ CLASS net/minecraft/class_2922 net/minecraft/world/gen/carver/ConfiguredCarver FIELD field_13279 carver Lnet/minecraft/class_2939; FIELD field_24828 REGISTRY_CODEC Lcom/mojang/serialization/Codec; FIELD field_25832 CODEC Lcom/mojang/serialization/Codec; + FIELD field_26755 LIST_CODEC Lcom/mojang/serialization/Codec; METHOD (Lnet/minecraft/class_2939;Lnet/minecraft/class_5871;)V ARG 1 carver ARG 2 config METHOD method_12668 carve (Lnet/minecraft/class_5873;Lnet/minecraft/class_2791;Ljava/util/function/Function;Ljava/util/Random;ILnet/minecraft/class_1923;Ljava/util/BitSet;)Z + ARG 1 context + ARG 2 chunk + ARG 3 posToBiome + ARG 4 random ARG 5 chunkX + ARG 6 pos + ARG 7 carvingMask METHOD method_12669 shouldCarve (Ljava/util/Random;)Z + ARG 1 random METHOD method_30378 getConfig ()Lnet/minecraft/class_5871; diff --git a/mappings/net/minecraft/world/gen/carver/RavineCarver.mapping b/mappings/net/minecraft/world/gen/carver/RavineCarver.mapping index a99dc09bd9..b988c8b9b9 100644 --- a/mappings/net/minecraft/world/gen/carver/RavineCarver.mapping +++ b/mappings/net/minecraft/world/gen/carver/RavineCarver.mapping @@ -1,3 +1,43 @@ CLASS net/minecraft/class_5870 net/minecraft/world/gen/carver/RavineCarver + FIELD field_29052 LOGGER Lorg/apache/logging/log4j/Logger; + METHOD method_33960 getVerticalScale (Lnet/minecraft/class_5869;Ljava/util/Random;DFF)D + ARG 1 config + ARG 2 random + ARG 3 pitch + ARG 5 branchCount + ARG 6 branchIndex METHOD method_33961 carveRavine (Lnet/minecraft/class_5873;Lnet/minecraft/class_5869;Lnet/minecraft/class_2791;Ljava/util/function/Function;JIDDDFFFIIDLjava/util/BitSet;)V + ARG 1 context + ARG 2 config + ARG 3 chunk + ARG 4 posToBiome + ARG 5 seed + ARG 7 seaLevel + ARG 8 x + ARG 10 y + ARG 12 z + ARG 14 width + ARG 15 yaw + ARG 16 pitch + ARG 17 branchStartIndex + ARG 18 branchCount + ARG 19 yawPitchRatio + ARG 21 carvingMask + METHOD method_33963 getY (Lnet/minecraft/class_5873;Lnet/minecraft/class_5869;Ljava/util/Random;)I + ARG 1 context + ARG 2 config + ARG 3 random + METHOD method_33964 isPositionExcluded (Lnet/minecraft/class_5873;[FDDDI)Z + ARG 1 context + ARG 2 horizontalStretchFactors + ARG 3 scaledRelativeX + ARG 5 scaledRelativeY + ARG 7 scaledRelativeZ + ARG 9 y + METHOD method_33965 ([FLnet/minecraft/class_5873;DDDI)Z + ARG 2 context + ARG 9 y METHOD method_33966 createHorizontalStretchFactors (Lnet/minecraft/class_5873;Lnet/minecraft/class_5869;Ljava/util/Random;)[F + ARG 1 context + ARG 2 config + ARG 3 random diff --git a/mappings/net/minecraft/world/gen/chunk/NoiseChunkGenerator.mapping b/mappings/net/minecraft/world/gen/chunk/NoiseChunkGenerator.mapping index cbd9dad787..f0d800f0ef 100644 --- a/mappings/net/minecraft/world/gen/chunk/NoiseChunkGenerator.mapping +++ b/mappings/net/minecraft/world/gen/chunk/NoiseChunkGenerator.mapping @@ -14,6 +14,7 @@ CLASS net/minecraft/class_3754 net/minecraft/world/gen/chunk/NoiseChunkGenerator FIELD field_28746 EMPTY [Lnet/minecraft/class_2680; FIELD field_28747 noiseSizeY I FIELD field_28748 noiseColumnSampler Lnet/minecraft/class_5818; + FIELD field_28843 edgeDensityNoise Lnet/minecraft/class_5216; FIELD field_28844 waterLevelNoise Lnet/minecraft/class_5216; FIELD field_28845 hasAquifers Z FIELD field_28913 blockInterpolator Lnet/minecraft/class_5840; diff --git a/mappings/net/minecraft/world/gen/feature/AbstractPileFeature.mapping b/mappings/net/minecraft/world/gen/feature/BlockPileFeature.mapping similarity index 54% rename from mappings/net/minecraft/world/gen/feature/AbstractPileFeature.mapping rename to mappings/net/minecraft/world/gen/feature/BlockPileFeature.mapping index 46b6cb07f1..06303869b3 100644 --- a/mappings/net/minecraft/world/gen/feature/AbstractPileFeature.mapping +++ b/mappings/net/minecraft/world/gen/feature/BlockPileFeature.mapping @@ -1,5 +1,5 @@ -CLASS net/minecraft/class_3805 net/minecraft/world/gen/feature/AbstractPileFeature - METHOD method_16707 canPlacePileBlock (Lnet/minecraft/class_1936;Lnet/minecraft/class_2338;Ljava/util/Random;)Z +CLASS net/minecraft/class_3805 net/minecraft/world/gen/feature/BlockPileFeature + METHOD method_16707 canPlace (Lnet/minecraft/class_1936;Lnet/minecraft/class_2338;Ljava/util/Random;)Z ARG 1 world ARG 2 pos ARG 3 random diff --git a/mappings/net/minecraft/world/gen/feature/ConfiguredFeatures.mapping b/mappings/net/minecraft/world/gen/feature/ConfiguredFeatures.mapping index ef3aeabbd6..6e6919b36e 100644 --- a/mappings/net/minecraft/world/gen/feature/ConfiguredFeatures.mapping +++ b/mappings/net/minecraft/world/gen/feature/ConfiguredFeatures.mapping @@ -1,5 +1,13 @@ CLASS net/minecraft/class_5464 net/minecraft/world/gen/feature/ConfiguredFeatures FIELD field_26090 FOREST_FLOWER_VEGETATION_CONFIGS Lcom/google/common/collect/ImmutableList; + FIELD field_29084 IRON_ORE_TARGETS Lcom/google/common/collect/ImmutableList; + FIELD field_29085 REDSTONE_ORE_TARGETS Lcom/google/common/collect/ImmutableList; + FIELD field_29086 GOLD_ORE_TARGETS Lcom/google/common/collect/ImmutableList; + FIELD field_29087 DIAMOND_ORE_TARGETS Lcom/google/common/collect/ImmutableList; + FIELD field_29088 LAPIS_ORE_TARGETS Lcom/google/common/collect/ImmutableList; + FIELD field_29089 COAL_CONFIG Lnet/minecraft/class_3124; + FIELD field_29090 IRON_CONFIG Lnet/minecraft/class_3124; + FIELD field_29091 REDSTONE_CONFIG Lnet/minecraft/class_3124; METHOD method_30590 register (Ljava/lang/String;Lnet/minecraft/class_2975;)Lnet/minecraft/class_2975; ARG 0 id ARG 1 configuredFeature @@ -126,3 +134,9 @@ CLASS net/minecraft/class_5464 net/minecraft/world/gen/feature/ConfiguredFeature FIELD field_27798 CALCITE Lnet/minecraft/class_2680; FIELD field_27799 TUFF Lnet/minecraft/class_2680; FIELD field_27800 COPPER_ORE Lnet/minecraft/class_2680; + FIELD field_29093 SMOOTH_BASALT Lnet/minecraft/class_2680; + FIELD field_29094 DEEPSLATE_IRON_ORE Lnet/minecraft/class_2680; + FIELD field_29095 DEEPSLATE_GOLD_ORE Lnet/minecraft/class_2680; + FIELD field_29096 DEEPSLATE_REDSTONE_ORE Lnet/minecraft/class_2680; + FIELD field_29097 DEEPSLATE_DIAMOND_ORE Lnet/minecraft/class_2680; + FIELD field_29098 DEEPSLATE_LAPIS_ORE Lnet/minecraft/class_2680; diff --git a/mappings/net/minecraft/world/gen/feature/CoralFeature.mapping b/mappings/net/minecraft/world/gen/feature/CoralFeature.mapping index 1441b2f0e1..6f0c3e91d9 100644 --- a/mappings/net/minecraft/world/gen/feature/CoralFeature.mapping +++ b/mappings/net/minecraft/world/gen/feature/CoralFeature.mapping @@ -1,10 +1,10 @@ CLASS net/minecraft/class_2978 net/minecraft/world/gen/feature/CoralFeature - METHOD method_12863 spawnCoral (Lnet/minecraft/class_1936;Ljava/util/Random;Lnet/minecraft/class_2338;Lnet/minecraft/class_2680;)Z + METHOD method_12863 generateCoral (Lnet/minecraft/class_1936;Ljava/util/Random;Lnet/minecraft/class_2338;Lnet/minecraft/class_2680;)Z ARG 1 world ARG 2 random ARG 3 pos ARG 4 state - METHOD method_12864 spawnCoralPiece (Lnet/minecraft/class_1936;Ljava/util/Random;Lnet/minecraft/class_2338;Lnet/minecraft/class_2680;)Z + METHOD method_12864 generateCoralPiece (Lnet/minecraft/class_1936;Ljava/util/Random;Lnet/minecraft/class_2338;Lnet/minecraft/class_2680;)Z ARG 1 world ARG 2 random ARG 3 pos diff --git a/mappings/net/minecraft/world/gen/feature/DeltaFeature.mapping b/mappings/net/minecraft/world/gen/feature/DeltaFeature.mapping index 36342ffe6d..b9e7c6293e 100644 --- a/mappings/net/minecraft/world/gen/feature/DeltaFeature.mapping +++ b/mappings/net/minecraft/world/gen/feature/DeltaFeature.mapping @@ -1,3 +1,7 @@ CLASS net/minecraft/class_5154 net/minecraft/world/gen/feature/DeltaFeature FIELD field_23883 DIRECTIONS [Lnet/minecraft/class_2350; FIELD field_24133 BLOCKS Lcom/google/common/collect/ImmutableList; + METHOD method_27103 canPlace (Lnet/minecraft/class_1936;Lnet/minecraft/class_2338;Lnet/minecraft/class_5158;)Z + ARG 0 world + ARG 1 pos + ARG 2 config diff --git a/mappings/net/minecraft/world/gen/feature/Feature.mapping b/mappings/net/minecraft/world/gen/feature/Feature.mapping index bb630c6b89..90ddb2c49f 100644 --- a/mappings/net/minecraft/world/gen/feature/Feature.mapping +++ b/mappings/net/minecraft/world/gen/feature/Feature.mapping @@ -32,3 +32,10 @@ CLASS net/minecraft/class_3031 net/minecraft/world/gen/feature/Feature ARG 0 feature METHOD method_28629 (Lnet/minecraft/class_3037;)Lnet/minecraft/class_2975; ARG 1 config + METHOD method_33981 isExposedToAir (Ljava/util/function/Function;Lnet/minecraft/class_2338;)Z + ARG 0 posToState + ARG 1 pos + METHOD method_33982 testAdjacentStates (Ljava/util/function/Function;Lnet/minecraft/class_2338;Ljava/util/function/Predicate;)Z + ARG 0 posToState + ARG 1 pos + ARG 2 predicate diff --git a/mappings/net/minecraft/world/gen/feature/OreFeature.mapping b/mappings/net/minecraft/world/gen/feature/OreFeature.mapping index dde8e2745a..e50be3c6e3 100644 --- a/mappings/net/minecraft/world/gen/feature/OreFeature.mapping +++ b/mappings/net/minecraft/world/gen/feature/OreFeature.mapping @@ -14,3 +14,13 @@ CLASS net/minecraft/class_3122 net/minecraft/world/gen/feature/OreFeature ARG 18 z ARG 19 horizontalSize ARG 20 verticalSize + METHOD method_33983 shouldPlace (Lnet/minecraft/class_2680;Ljava/util/function/Function;Ljava/util/Random;Lnet/minecraft/class_3124;Lnet/minecraft/class_3124$class_5876;Lnet/minecraft/class_2338$class_2339;)Z + ARG 0 state + ARG 1 posToState + ARG 2 random + ARG 3 config + ARG 4 target + ARG 5 pos + METHOD method_33984 shouldNotDiscard (Ljava/util/Random;F)Z + ARG 0 random + ARG 1 chance diff --git a/mappings/net/minecraft/world/gen/feature/OreFeatureConfig.mapping b/mappings/net/minecraft/world/gen/feature/OreFeatureConfig.mapping index da44a76aff..80e6cf1532 100644 --- a/mappings/net/minecraft/world/gen/feature/OreFeatureConfig.mapping +++ b/mappings/net/minecraft/world/gen/feature/OreFeatureConfig.mapping @@ -1,7 +1,37 @@ CLASS net/minecraft/class_3124 net/minecraft/world/gen/feature/OreFeatureConfig FIELD field_13723 size I FIELD field_24896 CODEC Lcom/mojang/serialization/Codec; + FIELD field_29063 targets Ljava/util/List; + FIELD field_29064 discardOnAirChance F + METHOD (Ljava/util/List;I)V + ARG 1 targets + ARG 2 size + METHOD (Ljava/util/List;IF)V + ARG 1 targets + ARG 2 size + ARG 3 discardOnAirChance + METHOD (Lnet/minecraft/class_3825;Lnet/minecraft/class_2680;I)V + ARG 1 test + ARG 2 state + ARG 3 size + METHOD (Lnet/minecraft/class_3825;Lnet/minecraft/class_2680;IF)V + ARG 1 test + ARG 2 state + ARG 3 size + ARG 4 discardOnAirChance + METHOD method_33994 create (Lnet/minecraft/class_3825;Lnet/minecraft/class_2680;)Lnet/minecraft/class_3124$class_5876; + ARG 0 test + ARG 1 state CLASS class_5436 Rules FIELD field_25845 BASE_STONE_OVERWORLD Lnet/minecraft/class_3825; FIELD field_25846 NETHERRACK Lnet/minecraft/class_3825; FIELD field_25847 BASE_STONE_NETHER Lnet/minecraft/class_3825; + FIELD field_29065 STONE_ORE_REPLACEABLES Lnet/minecraft/class_3825; + FIELD field_29066 DEEPSLATE_ORE_REPLACEABLES Lnet/minecraft/class_3825; + CLASS class_5876 Target + FIELD field_29067 CODEC Lcom/mojang/serialization/Codec; + FIELD field_29068 target Lnet/minecraft/class_3825; + FIELD field_29069 state Lnet/minecraft/class_2680; + METHOD (Lnet/minecraft/class_3825;Lnet/minecraft/class_2680;)V + ARG 1 target + ARG 2 state diff --git a/mappings/net/minecraft/world/gen/feature/ScatteredOreFeature.mapping b/mappings/net/minecraft/world/gen/feature/ScatteredOreFeature.mapping new file mode 100644 index 0000000000..54f2e01c3c --- /dev/null +++ b/mappings/net/minecraft/world/gen/feature/ScatteredOreFeature.mapping @@ -0,0 +1,9 @@ +CLASS net/minecraft/class_5875 net/minecraft/world/gen/feature/ScatteredOreFeature + METHOD method_33985 setPos (Lnet/minecraft/class_2338$class_2339;Ljava/util/Random;Lnet/minecraft/class_2338;I)V + ARG 1 mutable + ARG 2 random + ARG 3 origin + ARG 4 spread + METHOD method_33986 getSpread (Ljava/util/Random;I)I + ARG 1 random + ARG 2 spread diff --git a/mappings/net/minecraft/world/gen/tree/AlterGroundTreeDecorator.mapping b/mappings/net/minecraft/world/gen/treedecorator/AlterGroundTreeDecorator.mapping similarity index 87% rename from mappings/net/minecraft/world/gen/tree/AlterGroundTreeDecorator.mapping rename to mappings/net/minecraft/world/gen/treedecorator/AlterGroundTreeDecorator.mapping index 4181e4f6f0..a2fcd9cb15 100644 --- a/mappings/net/minecraft/world/gen/tree/AlterGroundTreeDecorator.mapping +++ b/mappings/net/minecraft/world/gen/treedecorator/AlterGroundTreeDecorator.mapping @@ -1,4 +1,4 @@ -CLASS net/minecraft/class_4658 net/minecraft/world/gen/tree/AlterGroundTreeDecorator +CLASS net/minecraft/class_4658 net/minecraft/world/gen/treedecorator/AlterGroundTreeDecorator FIELD field_21316 provider Lnet/minecraft/class_4651; FIELD field_24957 CODEC Lcom/mojang/serialization/Codec; METHOD (Lnet/minecraft/class_4651;)V diff --git a/mappings/net/minecraft/world/gen/tree/BeehiveTreeDecorator.mapping b/mappings/net/minecraft/world/gen/treedecorator/BeehiveTreeDecorator.mapping similarity index 75% rename from mappings/net/minecraft/world/gen/tree/BeehiveTreeDecorator.mapping rename to mappings/net/minecraft/world/gen/treedecorator/BeehiveTreeDecorator.mapping index 7b5dac1a31..8c7b51d2e9 100644 --- a/mappings/net/minecraft/world/gen/tree/BeehiveTreeDecorator.mapping +++ b/mappings/net/minecraft/world/gen/treedecorator/BeehiveTreeDecorator.mapping @@ -1,4 +1,4 @@ -CLASS net/minecraft/class_4659 net/minecraft/world/gen/tree/BeehiveTreeDecorator +CLASS net/minecraft/class_4659 net/minecraft/world/gen/treedecorator/BeehiveTreeDecorator FIELD field_21317 probability F FIELD field_24958 CODEC Lcom/mojang/serialization/Codec; METHOD (F)V diff --git a/mappings/net/minecraft/world/gen/tree/CocoaBeansTreeDecorator.mapping b/mappings/net/minecraft/world/gen/treedecorator/CocoaBeansTreeDecorator.mapping similarity index 78% rename from mappings/net/minecraft/world/gen/tree/CocoaBeansTreeDecorator.mapping rename to mappings/net/minecraft/world/gen/treedecorator/CocoaBeansTreeDecorator.mapping index 7cc22601db..eadf88c22f 100644 --- a/mappings/net/minecraft/world/gen/tree/CocoaBeansTreeDecorator.mapping +++ b/mappings/net/minecraft/world/gen/treedecorator/CocoaBeansTreeDecorator.mapping @@ -1,4 +1,4 @@ -CLASS net/minecraft/class_4660 net/minecraft/world/gen/tree/CocoaBeansTreeDecorator +CLASS net/minecraft/class_4660 net/minecraft/world/gen/treedecorator/CocoaBeansTreeDecorator FIELD field_21318 probability F FIELD field_24959 CODEC Lcom/mojang/serialization/Codec; METHOD (F)V diff --git a/mappings/net/minecraft/world/gen/tree/LeavesVineTreeDecorator.mapping b/mappings/net/minecraft/world/gen/treedecorator/LeavesVineTreeDecorator.mapping similarity index 86% rename from mappings/net/minecraft/world/gen/tree/LeavesVineTreeDecorator.mapping rename to mappings/net/minecraft/world/gen/treedecorator/LeavesVineTreeDecorator.mapping index 5b2fb0a58a..7b77b00997 100644 --- a/mappings/net/minecraft/world/gen/tree/LeavesVineTreeDecorator.mapping +++ b/mappings/net/minecraft/world/gen/treedecorator/LeavesVineTreeDecorator.mapping @@ -1,4 +1,4 @@ -CLASS net/minecraft/class_4661 net/minecraft/world/gen/tree/LeavesVineTreeDecorator +CLASS net/minecraft/class_4661 net/minecraft/world/gen/treedecorator/LeavesVineTreeDecorator FIELD field_24960 CODEC Lcom/mojang/serialization/Codec; FIELD field_24961 INSTANCE Lnet/minecraft/class_4661; METHOD method_23467 placeVines (Lnet/minecraft/class_3747;Lnet/minecraft/class_2338;Lnet/minecraft/class_2746;Ljava/util/Set;Lnet/minecraft/class_3341;)V diff --git a/mappings/net/minecraft/world/gen/tree/TreeDecorator.mapping b/mappings/net/minecraft/world/gen/treedecorator/TreeDecorator.mapping similarity index 92% rename from mappings/net/minecraft/world/gen/tree/TreeDecorator.mapping rename to mappings/net/minecraft/world/gen/treedecorator/TreeDecorator.mapping index 43fd29871d..bf1542d8e9 100644 --- a/mappings/net/minecraft/world/gen/tree/TreeDecorator.mapping +++ b/mappings/net/minecraft/world/gen/treedecorator/TreeDecorator.mapping @@ -1,4 +1,4 @@ -CLASS net/minecraft/class_4662 net/minecraft/world/gen/tree/TreeDecorator +CLASS net/minecraft/class_4662 net/minecraft/world/gen/treedecorator/TreeDecorator COMMENT Tree decorators can add additional blocks to trees, such as vines or beehives. FIELD field_24962 TYPE_CODEC Lcom/mojang/serialization/Codec; METHOD method_23469 generate (Lnet/minecraft/class_5281;Ljava/util/Random;Ljava/util/List;Ljava/util/List;Ljava/util/Set;Lnet/minecraft/class_3341;)V diff --git a/mappings/net/minecraft/world/gen/tree/TreeDecoratorType.mapping b/mappings/net/minecraft/world/gen/treedecorator/TreeDecoratorType.mapping similarity index 78% rename from mappings/net/minecraft/world/gen/tree/TreeDecoratorType.mapping rename to mappings/net/minecraft/world/gen/treedecorator/TreeDecoratorType.mapping index 4b957718a7..4f2232f4e6 100644 --- a/mappings/net/minecraft/world/gen/tree/TreeDecoratorType.mapping +++ b/mappings/net/minecraft/world/gen/treedecorator/TreeDecoratorType.mapping @@ -1,4 +1,4 @@ -CLASS net/minecraft/class_4663 net/minecraft/world/gen/tree/TreeDecoratorType +CLASS net/minecraft/class_4663 net/minecraft/world/gen/treedecorator/TreeDecoratorType FIELD field_24963 codec Lcom/mojang/serialization/Codec; METHOD (Lcom/mojang/serialization/Codec;)V ARG 1 codec diff --git a/mappings/net/minecraft/world/gen/tree/TrunkVineTreeDecorator.mapping b/mappings/net/minecraft/world/gen/treedecorator/TrunkVineTreeDecorator.mapping similarity index 73% rename from mappings/net/minecraft/world/gen/tree/TrunkVineTreeDecorator.mapping rename to mappings/net/minecraft/world/gen/treedecorator/TrunkVineTreeDecorator.mapping index 6caf013688..0fdb839c84 100644 --- a/mappings/net/minecraft/world/gen/tree/TrunkVineTreeDecorator.mapping +++ b/mappings/net/minecraft/world/gen/treedecorator/TrunkVineTreeDecorator.mapping @@ -1,4 +1,4 @@ -CLASS net/minecraft/class_4664 net/minecraft/world/gen/tree/TrunkVineTreeDecorator +CLASS net/minecraft/class_4664 net/minecraft/world/gen/treedecorator/TrunkVineTreeDecorator FIELD field_24964 CODEC Lcom/mojang/serialization/Codec; FIELD field_24965 INSTANCE Lnet/minecraft/class_4664; METHOD method_23474 (Ljava/util/Random;Lnet/minecraft/class_5281;Ljava/util/Set;Lnet/minecraft/class_3341;Lnet/minecraft/class_2338;)V