Mappings for 1.18 mountain surface builders (#2609)

* Mappings for 1.18 mountain surface builders

* Reverted rename of old mountain surface builders

* Added mapping for stony peaks

* Updated to experimental snapshot 4

* StoneShoreSurfaceBuilder -> StoneSurfaceBuilder

* Removed rest of merge conflict

* isPosBelowAirOrFluid -> isAboveAirOrFluid
This commit is contained in:
mschae23 2021-08-26 00:49:21 +02:00 committed by GitHub
parent 26eb96eec5
commit 5147562347
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
8 changed files with 73 additions and 15 deletions

View File

@ -0,0 +1,42 @@
CLASS net/minecraft/class_6473 net/minecraft/world/gen/surfacebuilder/AbstractMountainSurfaceBuilder
FIELD field_34252 noiseSampler Lnet/minecraft/class_5216;
FIELD field_34253 seed J
METHOD method_37775 getSteepSlopeBlockConfig ()Lnet/minecraft/class_6473$class_6474;
METHOD method_37776 getTopMaterial (Lnet/minecraft/class_3527;II)Lnet/minecraft/class_2680;
ARG 1 config
ARG 2 x
ARG 3 z
METHOD method_37777 getUnderMaterial (Lnet/minecraft/class_3527;II)Lnet/minecraft/class_2680;
ARG 1 config
ARG 2 x
ARG 3 z
METHOD method_37778 getBlockFromNoise (DIILnet/minecraft/class_2680;Lnet/minecraft/class_2680;DD)Lnet/minecraft/class_2680;
ARG 1 scale
ARG 3 x
ARG 4 z
ARG 5 outsideRangeState
ARG 6 insideRangeState
ARG 7 noiseMin
ARG 9 noiseMax
METHOD method_37779 shouldPlaceSteepSlopeBlock (Lnet/minecraft/class_2791;IILnet/minecraft/class_6473$class_6474;)Z
ARG 1 chunk
ARG 2 x
ARG 3 z
ARG 4 config
CLASS class_6474 SteepSlopeBlockConfig
FIELD field_34254 state Lnet/minecraft/class_2680;
FIELD field_34255 north Z
FIELD field_34256 south Z
FIELD field_34257 west Z
FIELD field_34258 east Z
METHOD <init> (Lnet/minecraft/class_2680;ZZZZ)V
ARG 1 state
ARG 2 north
ARG 3 south
ARG 4 west
ARG 5 east
METHOD method_37780 getState ()Lnet/minecraft/class_2680;
METHOD method_37781 isNorth ()Z
METHOD method_37782 isSouth ()Z
METHOD method_37783 isWest ()Z
METHOD method_37784 isEast ()Z

View File

@ -12,6 +12,14 @@ CLASS net/minecraft/class_3510 net/minecraft/world/gen/surfacebuilder/DefaultSur
ARG 10 fluidBlock
ARG 11 topBlock
ARG 12 underBlock
METHOD method_37830 isPosAboveAirOrFluid (Lnet/minecraft/class_2791;Lnet/minecraft/class_2338;)Z
METHOD method_37829 (Lnet/minecraft/class_2680;Lnet/minecraft/class_2791;Lnet/minecraft/class_2338;)Lnet/minecraft/class_2680;
ARG 0 state
ARG 1 chunk
ARG 2 pos
METHOD method_37830 isAboveAirOrFluid (Lnet/minecraft/class_2791;Lnet/minecraft/class_2338;)Z
ARG 0 chunk
ARG 1 pos
METHOD method_37850 (Lnet/minecraft/class_2680;Lnet/minecraft/class_2791;Lnet/minecraft/class_2338;I)Lnet/minecraft/class_2680;
ARG 0 state
ARG 1 chunk
ARG 2 pos

View File

@ -1 +1,2 @@
CLASS net/minecraft/class_6472 net/minecraft/world/gen/surfacebuilder/LoftyPeaksSurfaceBuilder
FIELD field_34251 STEEP_SLOPE_BLOCK_CONFIG Lnet/minecraft/class_6473$class_6474;

View File

@ -1,11 +0,0 @@
CLASS net/minecraft/class_6473 net/minecraft/world/gen/surfacebuilder/NewMountainSurfaceBuilder
FIELD field_34252 noiseSampler Lnet/minecraft/class_5216;
FIELD field_34253 seed J
METHOD method_37776 getTopMaterial (Lnet/minecraft/class_3527;II)Lnet/minecraft/class_2680;
ARG 1 config
ARG 2 x
ARG 3 z
METHOD method_37777 getUnderMaterial (Lnet/minecraft/class_3527;II)Lnet/minecraft/class_2680;
ARG 1 config
ARG 2 x
ARG 3 z

View File

@ -1 +1,2 @@
CLASS net/minecraft/class_6475 net/minecraft/world/gen/surfacebuilder/SnowcappedPeaksSurfaceBuilder
FIELD field_34259 STEEP_SLOPE_BLOCK_CONFIG Lnet/minecraft/class_6473$class_6474;

View File

@ -1 +1,2 @@
CLASS net/minecraft/class_6476 net/minecraft/world/gen/surfacebuilder/SnowySlopesSurfaceBuilder
FIELD field_34260 STEEP_SLOPE_BLOCK_CONFIG Lnet/minecraft/class_6473$class_6474;

View File

@ -0,0 +1,8 @@
CLASS net/minecraft/class_6485 net/minecraft/world/gen/surfacebuilder/StoneSurfaceBuilder
FIELD field_34319 ANDESITE_THRESHOLD F
FIELD field_34320 LAYER_THRESHOLD F
FIELD field_34321 seed J
FIELD field_34322 layerBlockNoise Lnet/minecraft/class_5216;
FIELD field_34323 layerNoise Lnet/minecraft/class_5216;
METHOD method_37866 getLayerBlockConfig (D)Lnet/minecraft/class_3527;
ARG 1 noise

View File

@ -38,10 +38,18 @@ CLASS net/minecraft/class_3523 net/minecraft/world/gen/surfacebuilder/SurfaceBui
FIELD field_23929 MAGMA_BLOCK Lnet/minecraft/class_2680;
FIELD field_25016 codec Lcom/mojang/serialization/Codec;
FIELD field_34265 SNOW_BLOCK Lnet/minecraft/class_2680;
FIELD field_34266 SNOW_CONFIG Lnet/minecraft/class_3527;
FIELD field_34266 DIRT_SNOW_CONFIG Lnet/minecraft/class_3527;
FIELD field_34267 LOFTY_PEAKS_CONFIG Lnet/minecraft/class_3527;
FIELD field_34310 SNOWY_SLOPES_CONFIG Lnet/minecraft/class_3527;
FIELD field_34311 SNOWCAPPED_PEAKS_CONFIG Lnet/minecraft/class_3527;
FIELD field_34310 SNOW_CONFIG Lnet/minecraft/class_3527;
FIELD field_34311 SNOW_PEAKS_CONFIG Lnet/minecraft/class_3527;
FIELD field_34325 CALCITE Lnet/minecraft/class_2680;
FIELD field_34326 ANDESITE Lnet/minecraft/class_2680;
FIELD field_34327 GRANITE Lnet/minecraft/class_2680;
FIELD field_34328 DIORITE Lnet/minecraft/class_2680;
FIELD field_34329 GRANITE_CONFIG Lnet/minecraft/class_3527;
FIELD field_34330 ANDESITE_CONFIG Lnet/minecraft/class_3527;
FIELD field_34331 DIORITE_CONFIG Lnet/minecraft/class_3527;
FIELD field_34332 CACLCITE_CONFIG Lnet/minecraft/class_3527;
METHOD <init> (Lcom/mojang/serialization/Codec;)V
ARG 1 codec
METHOD method_15305 generate (Ljava/util/Random;Lnet/minecraft/class_2791;Lnet/minecraft/class_1959;IIIDLnet/minecraft/class_2680;Lnet/minecraft/class_2680;IIJLnet/minecraft/class_3531;)V