From 2674326689f23c9d0aa252d4b68ae072abd11b51 Mon Sep 17 00:00:00 2001 From: SuperCoder79 <25208576+SuperCoder7979@users.noreply.github.com> Date: Sun, 28 Feb 2021 09:41:04 -0500 Subject: [PATCH] Carver mappings (#2106) * Carver mappings * Apply suggestions from code review Co-authored-by: liach <7806504+liach@users.noreply.github.com> * Fix grimstone Co-authored-by: liach <7806504+liach@users.noreply.github.com> --- mappings/net/minecraft/class_5868.mapping | 3 -- ....mapping => DeepslateInterpolator.mapping} | 6 +-- .../minecraft/world/gen/HeightContext.mapping | 3 ++ .../minecraft/world/gen/carver/Carver.mapping | 44 ++++++++++++++++++- .../world/gen/carver/CarverConfig.mapping | 7 +++ .../world/gen/carver/CarverContext.mapping | 4 ++ .../gen/carver/CarverDebugConfig.mapping | 13 ++++++ .../world/gen/carver/CaveCarver.mapping | 26 ++++++++++- .../world/gen/carver/RavineCarver.mapping | 3 ++ .../gen/carver/RavineCarverConfig.mapping | 35 +++++++++++++++ .../gen/chunk/ChunkGeneratorSettings.mapping | 4 +- .../gen/feature/GeodeFeatureConfig.mapping | 2 + 12 files changed, 139 insertions(+), 11 deletions(-) delete mode 100644 mappings/net/minecraft/class_5868.mapping rename mappings/net/minecraft/world/gen/{GrimstoneInterpolator.mapping => DeepslateInterpolator.mapping} (63%) create mode 100644 mappings/net/minecraft/world/gen/HeightContext.mapping create mode 100644 mappings/net/minecraft/world/gen/carver/CarverConfig.mapping create mode 100644 mappings/net/minecraft/world/gen/carver/CarverContext.mapping create mode 100644 mappings/net/minecraft/world/gen/carver/CarverDebugConfig.mapping create mode 100644 mappings/net/minecraft/world/gen/carver/RavineCarver.mapping create mode 100644 mappings/net/minecraft/world/gen/carver/RavineCarverConfig.mapping diff --git a/mappings/net/minecraft/class_5868.mapping b/mappings/net/minecraft/class_5868.mapping deleted file mode 100644 index 70976a59f9..0000000000 --- a/mappings/net/minecraft/class_5868.mapping +++ /dev/null @@ -1,3 +0,0 @@ -CLASS net/minecraft/class_5868 - METHOD method_30458 getMaxY ()I - METHOD method_30462 getMinY ()I diff --git a/mappings/net/minecraft/world/gen/GrimstoneInterpolator.mapping b/mappings/net/minecraft/world/gen/DeepslateInterpolator.mapping similarity index 63% rename from mappings/net/minecraft/world/gen/GrimstoneInterpolator.mapping rename to mappings/net/minecraft/world/gen/DeepslateInterpolator.mapping index a03afc1214..b19eb9666a 100644 --- a/mappings/net/minecraft/world/gen/GrimstoneInterpolator.mapping +++ b/mappings/net/minecraft/world/gen/DeepslateInterpolator.mapping @@ -1,9 +1,9 @@ -CLASS net/minecraft/class_5842 net/minecraft/world/gen/GrimstoneInterpolator +CLASS net/minecraft/class_5842 net/minecraft/world/gen/DeepslateInterpolator FIELD field_28909 random Lnet/minecraft/class_2919; FIELD field_28910 seed J FIELD field_28911 defaultBlock Lnet/minecraft/class_2680; - FIELD field_28912 grimstone Lnet/minecraft/class_2680; + FIELD field_28912 deepslateState Lnet/minecraft/class_2680; METHOD (JLnet/minecraft/class_2680;Lnet/minecraft/class_2680;)V ARG 1 seed ARG 3 defaultBlock - ARG 4 grimstone + ARG 4 deepslateState diff --git a/mappings/net/minecraft/world/gen/HeightContext.mapping b/mappings/net/minecraft/world/gen/HeightContext.mapping new file mode 100644 index 0000000000..335b46d471 --- /dev/null +++ b/mappings/net/minecraft/world/gen/HeightContext.mapping @@ -0,0 +1,3 @@ +CLASS net/minecraft/class_5868 net/minecraft/world/gen/HeightContext + METHOD method_30458 getMaxY ()I + METHOD method_30462 getMinY ()I diff --git a/mappings/net/minecraft/world/gen/carver/Carver.mapping b/mappings/net/minecraft/world/gen/carver/Carver.mapping index 6a7fb88900..8b7698cd77 100644 --- a/mappings/net/minecraft/world/gen/carver/Carver.mapping +++ b/mappings/net/minecraft/world/gen/carver/Carver.mapping @@ -1,5 +1,6 @@ CLASS net/minecraft/class_2939 net/minecraft/world/gen/carver/Carver FIELD field_13294 CAVE_AIR Lnet/minecraft/class_2680; + FIELD field_13295 RAVINE Lnet/minecraft/class_2939; FIELD field_13296 LAVA Lnet/minecraft/class_3610; FIELD field_13298 carvableFluids Ljava/util/Set; FIELD field_13301 AIR Lnet/minecraft/class_2680; @@ -9,7 +10,14 @@ CLASS net/minecraft/class_2939 net/minecraft/world/gen/carver/Carver METHOD (Lcom/mojang/serialization/Codec;)V ARG 1 configCodec METHOD method_12702 carve (Lnet/minecraft/class_5873;Lnet/minecraft/class_5871;Lnet/minecraft/class_2791;Ljava/util/function/Function;Ljava/util/Random;ILnet/minecraft/class_1923;Ljava/util/BitSet;)Z - ARG 6 chunkZ + ARG 1 context + ARG 2 config + ARG 3 chunk + ARG 4 posToBiome + ARG 5 random + ARG 6 seaLevel + ARG 7 pos + ARG 8 carvingMask METHOD method_12703 canCarveBlock (Lnet/minecraft/class_2680;Lnet/minecraft/class_2680;)Z ARG 1 state ARG 2 stateAbove @@ -17,12 +25,46 @@ CLASS net/minecraft/class_2939 net/minecraft/world/gen/carver/Carver ARG 0 name ARG 1 carver METHOD method_12705 shouldCarve (Lnet/minecraft/class_5871;Ljava/util/Random;)Z + ARG 1 config + ARG 2 random METHOD method_12706 isOnBoundary (IIIIII)Z METHOD method_12709 canAlwaysCarveBlock (Lnet/minecraft/class_2680;)Z ARG 1 state METHOD method_12710 getBranchFactor ()I METHOD method_16581 carveAtPoint (Lnet/minecraft/class_5873;Lnet/minecraft/class_5871;Lnet/minecraft/class_2791;Ljava/util/function/Function;Ljava/util/BitSet;Ljava/util/Random;Lnet/minecraft/class_2338$class_2339;Lnet/minecraft/class_2338$class_2339;ILorg/apache/commons/lang3/mutable/MutableBoolean;)Z + ARG 1 context + ARG 2 config + ARG 3 chunk + ARG 4 posToBiome + ARG 5 carvingMask + ARG 6 random + ARG 7 pos + ARG 8 downPos ARG 9 mainChunkX + ARG 10 foundSurface 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 + ARG 0 pos + METHOD method_33977 isRegionUncarvable (Lnet/minecraft/class_2791;IIIIII)Z + ARG 1 chunk + 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 18 carvingMask + ARG 19 skipPredicate + METHOD method_33979 getState (Lnet/minecraft/class_5871;)Lnet/minecraft/class_2680; + ARG 0 config + METHOD method_33980 isDebug (Lnet/minecraft/class_5871;)Z + ARG 0 config + CLASS class_5874 SkipPredicate + METHOD shouldSkip (Lnet/minecraft/class_5873;DDDI)Z + ARG 1 context + ARG 2 scaledRelativeX + ARG 4 scaledRelativeY + ARG 6 scaledRelativeZ + ARG 8 y diff --git a/mappings/net/minecraft/world/gen/carver/CarverConfig.mapping b/mappings/net/minecraft/world/gen/carver/CarverConfig.mapping new file mode 100644 index 0000000000..d14a50a1ac --- /dev/null +++ b/mappings/net/minecraft/world/gen/carver/CarverConfig.mapping @@ -0,0 +1,7 @@ +CLASS net/minecraft/class_5871 net/minecraft/world/gen/carver/CarverConfig + FIELD field_29053 debugConfig Lnet/minecraft/class_5872; + FIELD field_29054 CONFIG_CODEC Lcom/mojang/serialization/Codec; + METHOD (FLnet/minecraft/class_5872;)V + ARG 1 chance + ARG 2 debugConfig + METHOD method_33969 getDebugConfig ()Lnet/minecraft/class_5872; diff --git a/mappings/net/minecraft/world/gen/carver/CarverContext.mapping b/mappings/net/minecraft/world/gen/carver/CarverContext.mapping new file mode 100644 index 0000000000..6325f9b709 --- /dev/null +++ b/mappings/net/minecraft/world/gen/carver/CarverContext.mapping @@ -0,0 +1,4 @@ +CLASS net/minecraft/class_5873 net/minecraft/world/gen/carver/CarverContext + FIELD field_29059 generator Lnet/minecraft/class_2794; + METHOD (Lnet/minecraft/class_2794;)V + ARG 1 generator diff --git a/mappings/net/minecraft/world/gen/carver/CarverDebugConfig.mapping b/mappings/net/minecraft/world/gen/carver/CarverDebugConfig.mapping new file mode 100644 index 0000000000..564c13ebb9 --- /dev/null +++ b/mappings/net/minecraft/world/gen/carver/CarverDebugConfig.mapping @@ -0,0 +1,13 @@ +CLASS net/minecraft/class_5872 net/minecraft/world/gen/carver/CarverDebugConfig + FIELD field_29055 DEFAULT Lnet/minecraft/class_5872; + FIELD field_29056 CODEC Lcom/mojang/serialization/Codec; + FIELD field_29057 debugMode Z + FIELD field_29058 debugState Lnet/minecraft/class_2680; + METHOD (ZLnet/minecraft/class_2680;)V + ARG 1 debugMode + ARG 2 debugState + METHOD method_33970 isDebugMode ()Z + METHOD method_33972 create (ZLnet/minecraft/class_2680;)Lnet/minecraft/class_5872; + ARG 0 debugMode + ARG 1 debugState + METHOD method_33973 getDebugState ()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 c6a564e8ed..9108d92000 100644 --- a/mappings/net/minecraft/world/gen/carver/CaveCarver.mapping +++ b/mappings/net/minecraft/world/gen/carver/CaveCarver.mapping @@ -1,16 +1,38 @@ CLASS net/minecraft/class_2925 net/minecraft/world/gen/carver/CaveCarver METHOD method_12674 carveCave (Lnet/minecraft/class_5873;Lnet/minecraft/class_5871;Lnet/minecraft/class_2791;Ljava/util/function/Function;JIDDDFDLjava/util/BitSet;Lnet/minecraft/class_2939$class_5874;)V - ARG 7 mainChunkZ + 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 yaw ARG 15 yawPitchRatio ARG 17 carvingMask + ARG 18 skipPredicate METHOD method_12675 carveTunnels (Lnet/minecraft/class_5873;Lnet/minecraft/class_5871;Lnet/minecraft/class_2791;Ljava/util/function/Function;JIDDDDDFFFIIDLjava/util/BitSet;Lnet/minecraft/class_2939$class_5874;)V - ARG 7 mainChunkZ + ARG 1 context + ARG 2 config + ARG 3 chunk + ARG 7 seaLevel METHOD method_16576 getTunnelSystemWidth (Ljava/util/Random;)F ARG 1 random METHOD method_16577 getMaxCaveCount ()I METHOD method_16578 getTunnelSystemHeightWidthRatio ()D METHOD method_16579 getCaveY (Lnet/minecraft/class_5873;Ljava/util/Random;)I + ARG 1 context + ARG 2 random + METHOD method_33974 isPositionExcluded (DDDD)Z + ARG 0 scaledRelativeX + ARG 2 scaledRelativeY + ARG 4 scaledRelativeZ + ARG 6 floorY + METHOD method_33975 (DLnet/minecraft/class_5873;DDDI)Z + ARG 2 context + ARG 3 scaledRelativeX + ARG 5 scaledRelativeY + ARG 7 scaledRelativeZ + ARG 9 y diff --git a/mappings/net/minecraft/world/gen/carver/RavineCarver.mapping b/mappings/net/minecraft/world/gen/carver/RavineCarver.mapping new file mode 100644 index 0000000000..a99dc09bd9 --- /dev/null +++ b/mappings/net/minecraft/world/gen/carver/RavineCarver.mapping @@ -0,0 +1,3 @@ +CLASS net/minecraft/class_5870 net/minecraft/world/gen/carver/RavineCarver + METHOD method_33961 carveRavine (Lnet/minecraft/class_5873;Lnet/minecraft/class_5869;Lnet/minecraft/class_2791;Ljava/util/function/Function;JIDDDFFFIIDLjava/util/BitSet;)V + METHOD method_33966 createHorizontalStretchFactors (Lnet/minecraft/class_5873;Lnet/minecraft/class_5869;Ljava/util/Random;)[F diff --git a/mappings/net/minecraft/world/gen/carver/RavineCarverConfig.mapping b/mappings/net/minecraft/world/gen/carver/RavineCarverConfig.mapping new file mode 100644 index 0000000000..b5849c884c --- /dev/null +++ b/mappings/net/minecraft/world/gen/carver/RavineCarverConfig.mapping @@ -0,0 +1,35 @@ +CLASS net/minecraft/class_5869 net/minecraft/world/gen/carver/RavineCarverConfig + FIELD field_29041 RAVINE_CODEC Lcom/mojang/serialization/Codec; + FIELD field_29042 bottom Lnet/minecraft/class_5843; + FIELD field_29043 top Lnet/minecraft/class_5843; + FIELD field_29044 yScale Lnet/minecraft/class_5428; + FIELD field_29045 distanceFactor Lnet/minecraft/class_5863; + FIELD field_29046 verticalRotation Lnet/minecraft/class_5863; + FIELD field_29047 thickness Lnet/minecraft/class_5863; + FIELD field_29048 widthSmoothness I + FIELD field_29049 horizontalRadiusFactor Lnet/minecraft/class_5863; + FIELD field_29050 verticalRadiusDefaultFactor F + FIELD field_29051 verticalRadiusCenterFactor F + METHOD (FLnet/minecraft/class_5872;Lnet/minecraft/class_5843;Lnet/minecraft/class_5843;Lnet/minecraft/class_5428;Lnet/minecraft/class_5863;Lnet/minecraft/class_5863;Lnet/minecraft/class_5863;ILnet/minecraft/class_5863;FF)V + ARG 1 probability + ARG 2 debugConfig + ARG 3 bottom + ARG 4 top + ARG 5 yScale + ARG 6 distanceFactor + ARG 7 verticalRotation + ARG 8 thickness + ARG 9 widthSmoothness + ARG 10 horizontalRadiusFactor + ARG 11 verticalRadiusDefaultFactor + ARG 12 verticalRadiusCenterFactor + METHOD method_33947 getBottom ()Lnet/minecraft/class_5843; + METHOD method_33950 getTop ()Lnet/minecraft/class_5843; + METHOD method_33951 getYScale ()Lnet/minecraft/class_5428; + METHOD method_33952 getDistanceFactor ()Lnet/minecraft/class_5863; + METHOD method_33953 getVerticalRotation ()Lnet/minecraft/class_5863; + METHOD method_33954 getThickness ()Lnet/minecraft/class_5863; + METHOD method_33955 getWidthSmoothness ()I + METHOD method_33956 getHorizontalRadiusFactor ()Lnet/minecraft/class_5863; + METHOD method_33957 getVerticalRadiusDefaultFactor ()F + METHOD method_33958 getVerticalRadiusCenterFactor ()F diff --git a/mappings/net/minecraft/world/gen/chunk/ChunkGeneratorSettings.mapping b/mappings/net/minecraft/world/gen/chunk/ChunkGeneratorSettings.mapping index 0d97107c24..1ddcc001b5 100644 --- a/mappings/net/minecraft/world/gen/chunk/ChunkGeneratorSettings.mapping +++ b/mappings/net/minecraft/world/gen/chunk/ChunkGeneratorSettings.mapping @@ -18,7 +18,7 @@ CLASS net/minecraft/class_5284 net/minecraft/world/gen/chunk/ChunkGeneratorSetti FIELD field_26707 INSTANCE Lnet/minecraft/class_5284; FIELD field_28846 aquifers Z FIELD field_28847 noiseCaves Z - FIELD field_28914 grimstone Z + FIELD field_28914 deepslate Z METHOD (Lnet/minecraft/class_5311;Lnet/minecraft/class_5309;Lnet/minecraft/class_2680;Lnet/minecraft/class_2680;IIIZZZZ)V ARG 1 structuresConfig ARG 2 generationShapeConfig @@ -66,4 +66,4 @@ CLASS net/minecraft/class_5284 net/minecraft/world/gen/chunk/ChunkGeneratorSetti METHOD method_31111 getInstance ()Lnet/minecraft/class_5284; METHOD method_33757 hasAquifers ()Z METHOD method_33758 hasNoiseCaves ()Z - METHOD method_33839 hasGrimstone ()Z + METHOD method_33839 hasDeepslate ()Z diff --git a/mappings/net/minecraft/world/gen/feature/GeodeFeatureConfig.mapping b/mappings/net/minecraft/world/gen/feature/GeodeFeatureConfig.mapping index 26d1004404..9cf101f3ed 100644 --- a/mappings/net/minecraft/world/gen/feature/GeodeFeatureConfig.mapping +++ b/mappings/net/minecraft/world/gen/feature/GeodeFeatureConfig.mapping @@ -16,6 +16,7 @@ CLASS net/minecraft/class_5589 net/minecraft/world/gen/feature/GeodeFeatureConfi FIELD field_27328 minGenOffset I FIELD field_27329 maxGenOffset I FIELD field_27330 noiseMultiplier D + FIELD field_29062 invalidBlocksThreshold I METHOD (Lnet/minecraft/class_5585;Lnet/minecraft/class_5587;Lnet/minecraft/class_5586;DDZIIIIIIIIDI)V ARG 1 layerConfig ARG 2 layerThicknessConfig @@ -32,3 +33,4 @@ CLASS net/minecraft/class_5589 net/minecraft/world/gen/feature/GeodeFeatureConfi ARG 15 minGenOffset ARG 16 maxGenOffset ARG 17 noiseMultiplier + ARG 19 invalidBlocksThreshold