From 2cac3f41788572ca11f8b543dc59b35eeed263b3 Mon Sep 17 00:00:00 2001 From: Shnupbups Date: Wed, 24 Nov 2021 04:24:16 +1100 Subject: [PATCH] 1.18 pre6 stuff (#2869) * 1.18 pre6 stuff * Update Biome.mapping * Update mappings/net/minecraft/world/chunk/BelowZeroRetrogen.mapping Co-authored-by: liach <7806504+liach@users.noreply.github.com> * Update mappings/net/minecraft/world/chunk/Chunk.mapping Co-authored-by: enbrain <69905075+enbrain@users.noreply.github.com> Co-authored-by: liach <7806504+liach@users.noreply.github.com> Co-authored-by: enbrain <69905075+enbrain@users.noreply.github.com> --- .../minecraft/block/EntityShapeContext.mapping | 4 +++- mappings/net/minecraft/entity/Entity.mapping | 8 ++++++++ .../minecraft/server/world/ServerWorld.mapping | 2 ++ .../minecraft/util/shape/BitSetVoxelSet.mapping | 2 +- .../net/minecraft/util/shape/VoxelShape.mapping | 16 ++++++++++++++++ mappings/net/minecraft/world/biome/Biome.mapping | 2 +- .../source/util/VanillaTerrainParameters.mapping | 2 ++ .../util/VanillaTerrainParametersCreator.mapping | 1 + .../world/chunk/BelowZeroRetrogen.mapping | 8 ++++++++ mappings/net/minecraft/world/chunk/Chunk.mapping | 7 +++++++ .../world/gen/StructureAccessor.mapping | 8 ++++++++ 11 files changed, 57 insertions(+), 3 deletions(-) diff --git a/mappings/net/minecraft/block/EntityShapeContext.mapping b/mappings/net/minecraft/block/EntityShapeContext.mapping index 66fdf8e856..2746dc1ada 100644 --- a/mappings/net/minecraft/block/EntityShapeContext.mapping +++ b/mappings/net/minecraft/block/EntityShapeContext.mapping @@ -10,7 +10,9 @@ CLASS net/minecraft/class_3727 net/minecraft/block/EntityShapeContext METHOD (ZDLnet/minecraft/class_1799;Ljava/util/function/Predicate;Lnet/minecraft/class_1297;)V ARG 1 descending ARG 2 minY - ARG 4 boots + ARG 4 heldItem + ARG 5 walkOnFluidPrecicate + ARG 6 entity METHOD method_27867 (Lnet/minecraft/class_3611;)Z ARG 0 fluid METHOD method_27868 (Lnet/minecraft/class_3611;)Z diff --git a/mappings/net/minecraft/entity/Entity.mapping b/mappings/net/minecraft/entity/Entity.mapping index 6c503a6d69..05fdf06143 100644 --- a/mappings/net/minecraft/entity/Entity.mapping +++ b/mappings/net/minecraft/entity/Entity.mapping @@ -196,8 +196,10 @@ CLASS net/minecraft/class_1297 net/minecraft/entity/Entity ARG 5 destZ METHOD method_20736 adjustMovementForCollisions (Lnet/minecraft/class_1297;Lnet/minecraft/class_243;Lnet/minecraft/class_238;Lnet/minecraft/class_1937;Ljava/util/List;)Lnet/minecraft/class_243; ARG 0 entity + ARG 1 movement ARG 2 entityBoundingBox ARG 3 world + ARG 4 collisions METHOD method_20737 adjustMovementForCollisions (Lnet/minecraft/class_243;Lnet/minecraft/class_238;Ljava/util/List;)Lnet/minecraft/class_243; ARG 0 movement ARG 1 entityBoundingBox @@ -283,6 +285,8 @@ CLASS net/minecraft/class_1297 net/minecraft/entity/Entity METHOD method_29495 refreshPositionAfterTeleport (Lnet/minecraft/class_243;)V ARG 1 pos METHOD method_29919 getLeashOffset ()Lnet/minecraft/class_243; + METHOD method_30022 (Lnet/minecraft/class_243;Lnet/minecraft/class_238;Lnet/minecraft/class_2680;)Z + ARG 3 state METHOD method_30076 removeFromDimension ()V METHOD method_30227 getTrackedPosition ()Lnet/minecraft/class_243; METHOD method_30228 updateTrackedPosition (Lnet/minecraft/class_243;)V @@ -427,6 +431,10 @@ CLASS net/minecraft/class_1297 net/minecraft/entity/Entity METHOD method_36975 playExtinguishSound ()V METHOD method_37215 playAmethystChimeSound (Lnet/minecraft/class_2680;)V ARG 1 state + METHOD method_37216 (Lnet/minecraft/class_1297;)V + ARG 0 player + METHOD method_37217 (Lnet/minecraft/class_1297;)Z + ARG 0 passenger METHOD method_37908 getWorld ()Lnet/minecraft/class_1937; METHOD method_38785 onLanding ()V METHOD method_39759 hasCollidedSoftly (Lnet/minecraft/class_243;)Z diff --git a/mappings/net/minecraft/server/world/ServerWorld.mapping b/mappings/net/minecraft/server/world/ServerWorld.mapping index 2fd4e9d908..e6cf291520 100644 --- a/mappings/net/minecraft/server/world/ServerWorld.mapping +++ b/mappings/net/minecraft/server/world/ServerWorld.mapping @@ -260,6 +260,8 @@ CLASS net/minecraft/class_3218 net/minecraft/server/world/ServerWorld METHOD method_39223 disableTickSchedulers (Lnet/minecraft/class_2818;)V ARG 1 chunk METHOD method_39501 tickWeather ()V + METHOD method_39778 cacheStructures (Lnet/minecraft/class_2791;)V + ARG 1 chunk METHOD method_8448 updateSleepingPlayers ()V METHOD method_8487 locateStructure (Lnet/minecraft/class_3195;Lnet/minecraft/class_2338;IZ)Lnet/minecraft/class_2338; ARG 1 feature diff --git a/mappings/net/minecraft/util/shape/BitSetVoxelSet.mapping b/mappings/net/minecraft/util/shape/BitSetVoxelSet.mapping index bfa237d0f7..75aed209de 100644 --- a/mappings/net/minecraft/util/shape/BitSetVoxelSet.mapping +++ b/mappings/net/minecraft/util/shape/BitSetVoxelSet.mapping @@ -20,7 +20,7 @@ CLASS net/minecraft/class_244 net/minecraft/util/shape/BitSetVoxelSet ARG 4 zPoints ARG 5 function METHOD method_1059 isColumnFull (IIII)Z - METHOD method_31939 (IIIIIIIII)Lnet/minecraft/class_244; + METHOD method_31939 create (IIIIIIIII)Lnet/minecraft/class_244; ARG 0 sizeX ARG 1 sizeY ARG 2 sizeZ diff --git a/mappings/net/minecraft/util/shape/VoxelShape.mapping b/mappings/net/minecraft/util/shape/VoxelShape.mapping index 567fa3eb85..827c0107df 100644 --- a/mappings/net/minecraft/util/shape/VoxelShape.mapping +++ b/mappings/net/minecraft/util/shape/VoxelShape.mapping @@ -4,6 +4,7 @@ CLASS net/minecraft/class_265 net/minecraft/util/shape/VoxelShape METHOD (Lnet/minecraft/class_251;)V ARG 1 voxels METHOD method_1089 forEachBox (Lnet/minecraft/class_259$class_260;)V + ARG 1 consumer METHOD method_1090 getBoundingBoxes ()Ljava/util/List; METHOD method_1091 getMin (Lnet/minecraft/class_2350$class_2351;)D ARG 1 axis @@ -40,8 +41,16 @@ CLASS net/minecraft/class_265 net/minecraft/util/shape/VoxelShape ARG 2 box ARG 3 maxDist METHOD method_1104 forEachEdge (Lnet/minecraft/class_259$class_260;)V + ARG 1 consumer METHOD method_1105 getMax (Lnet/minecraft/class_2350$class_2351;)D ARG 1 axis + METHOD method_1106 (Lnet/minecraft/class_259$class_260;IIIIII)V + ARG 2 minX + ARG 3 minY + ARG 4 minZ + ARG 5 maxX + ARG 6 maxY + ARG 7 maxZ METHOD method_1107 getBoundingBox ()Lnet/minecraft/class_238; METHOD method_1108 calculateMaxDistance (Lnet/minecraft/class_2350$class_2351;Lnet/minecraft/class_238;D)D ARG 1 axis @@ -57,6 +66,13 @@ CLASS net/minecraft/class_265 net/minecraft/util/shape/VoxelShape ARG 7 x2 ARG 9 y2 ARG 11 z2 + METHOD method_1112 (Lnet/minecraft/class_259$class_260;Lit/unimi/dsi/fastutil/doubles/DoubleList;Lit/unimi/dsi/fastutil/doubles/DoubleList;Lit/unimi/dsi/fastutil/doubles/DoubleList;IIIIII)V + ARG 4 minX + ARG 5 minY + ARG 6 minZ + ARG 7 maxX + ARG 8 maxY + ARG 9 maxZ METHOD method_20538 getFace (Lnet/minecraft/class_2350;)Lnet/minecraft/class_265; ARG 1 facing METHOD method_33661 getClosestPointTo (Lnet/minecraft/class_243;)Ljava/util/Optional; diff --git a/mappings/net/minecraft/world/biome/Biome.mapping b/mappings/net/minecraft/world/biome/Biome.mapping index 910d0cae86..6fb3bca7fa 100644 --- a/mappings/net/minecraft/world/biome/Biome.mapping +++ b/mappings/net/minecraft/world/biome/Biome.mapping @@ -51,7 +51,7 @@ CLASS net/minecraft/class_1959 net/minecraft/world/biome/Biome METHOD method_8694 getPrecipitation ()Lnet/minecraft/class_1959$class_1963; METHOD method_8696 canSetSnow (Lnet/minecraft/class_4538;Lnet/minecraft/class_2338;)Z ARG 1 world - ARG 2 blockPos + ARG 2 pos METHOD method_8697 getSkyColor ()I METHOD method_8698 getFoliageColor ()I METHOD method_8705 canSetIce (Lnet/minecraft/class_4538;Lnet/minecraft/class_2338;)Z diff --git a/mappings/net/minecraft/world/biome/source/util/VanillaTerrainParameters.mapping b/mappings/net/minecraft/world/biome/source/util/VanillaTerrainParameters.mapping index c0117ec2a4..b4255cde50 100644 --- a/mappings/net/minecraft/world/biome/source/util/VanillaTerrainParameters.mapping +++ b/mappings/net/minecraft/world/biome/source/util/VanillaTerrainParameters.mapping @@ -35,6 +35,8 @@ CLASS net/minecraft/class_6555 net/minecraft/world/biome/source/util/VanillaTerr METHOD method_38221 getPeak (Lnet/minecraft/class_6555$class_6556;)F ARG 1 point METHOD method_39288 getPeakSpline ()Lnet/minecraft/class_6492; + METHOD method_39457 createSurfaceParameters (Z)Lnet/minecraft/class_6555; + ARG 0 amplified CLASS class_6556 NoisePoint FIELD comp_235 continentalnessNoise F FIELD comp_236 erosionNoise F diff --git a/mappings/net/minecraft/world/biome/source/util/VanillaTerrainParametersCreator.mapping b/mappings/net/minecraft/world/biome/source/util/VanillaTerrainParametersCreator.mapping index c6eff4db64..cec3977bef 100644 --- a/mappings/net/minecraft/world/biome/source/util/VanillaTerrainParametersCreator.mapping +++ b/mappings/net/minecraft/world/biome/source/util/VanillaTerrainParametersCreator.mapping @@ -1,5 +1,6 @@ CLASS net/minecraft/class_6765 net/minecraft/world/biome/source/util/VanillaTerrainParametersCreator METHOD method_39421 createSurfaceParameters (Z)Lnet/minecraft/class_6555; + ARG 0 amplified METHOD method_39422 createNetherParameters ()Lnet/minecraft/class_6555; METHOD method_39423 createEndParameters ()Lnet/minecraft/class_6555; METHOD method_39923 createCavesParameters ()Lnet/minecraft/class_6555; diff --git a/mappings/net/minecraft/world/chunk/BelowZeroRetrogen.mapping b/mappings/net/minecraft/world/chunk/BelowZeroRetrogen.mapping index 821080775e..7566eefe67 100644 --- a/mappings/net/minecraft/world/chunk/BelowZeroRetrogen.mapping +++ b/mappings/net/minecraft/world/chunk/BelowZeroRetrogen.mapping @@ -26,3 +26,11 @@ CLASS net/minecraft/class_6746 net/minecraft/world/chunk/BelowZeroRetrogen ARG 4 y ARG 5 z ARG 6 noise + METHOD method_39895 isColumnMissingBedrock (II)Z + ARG 1 x + ARG 2 z + METHOD method_39896 (Lnet/minecraft/class_2839;Lnet/minecraft/class_2338;)V + ARG 1 pos + METHOD method_39897 hasMissingBedrock ()Z + METHOD method_39898 fillColumnsWithAirIfMissingBedrock (Lnet/minecraft/class_2839;)V + ARG 1 chunk diff --git a/mappings/net/minecraft/world/chunk/Chunk.mapping b/mappings/net/minecraft/world/chunk/Chunk.mapping index 50697ddbbf..7c90cdbdab 100644 --- a/mappings/net/minecraft/world/chunk/Chunk.mapping +++ b/mappings/net/minecraft/world/chunk/Chunk.mapping @@ -87,6 +87,11 @@ CLASS net/minecraft/class_2791 net/minecraft/world/chunk/Chunk METHOD method_32914 getGameEventDispatcher (I)Lnet/minecraft/class_5713; ARG 1 ySectionCoord METHOD method_38255 getOrCreateChunkNoiseSampler (Lnet/minecraft/class_5818;Ljava/util/function/Supplier;Lnet/minecraft/class_5284;Lnet/minecraft/class_6350$class_6565;Lnet/minecraft/class_6748;)Lnet/minecraft/class_6568; + ARG 1 noiseColumnSampler + ARG 2 columnSampler + ARG 3 chunkGeneratorSettings + ARG 4 fluidLevelSampler + ARG 5 blender METHOD method_38256 fillSectionArray (Lnet/minecraft/class_5539;Lnet/minecraft/class_2378;[Lnet/minecraft/class_2826;)V ARG 0 world ARG 1 biome @@ -94,6 +99,8 @@ CLASS net/minecraft/class_2791 net/minecraft/world/chunk/Chunk METHOD method_38257 populateBiomes (Lnet/minecraft/class_6780;Lnet/minecraft/class_6544$class_6552;)V ARG 1 biomeSupplier ARG 2 sampler + METHOD method_38258 setBiomeIfAbsent (Ljava/util/function/Supplier;)Lnet/minecraft/class_1959; + ARG 1 biomeSupplier METHOD method_38259 getSection (I)Lnet/minecraft/class_2826; ARG 1 yIndex METHOD method_38870 increaseInhabitedTime (J)V diff --git a/mappings/net/minecraft/world/gen/StructureAccessor.mapping b/mappings/net/minecraft/world/gen/StructureAccessor.mapping index 7ed7121fce..892f275a69 100644 --- a/mappings/net/minecraft/world/gen/StructureAccessor.mapping +++ b/mappings/net/minecraft/world/gen/StructureAccessor.mapping @@ -1,9 +1,11 @@ CLASS net/minecraft/class_5138 net/minecraft/world/gen/StructureAccessor FIELD field_24404 world Lnet/minecraft/class_1936; FIELD field_24497 options Lnet/minecraft/class_5285; + FIELD field_36216 locator Lnet/minecraft/class_6832; METHOD (Lnet/minecraft/class_1936;Lnet/minecraft/class_5285;Lnet/minecraft/class_6832;)V ARG 1 world ARG 2 options + ARG 3 locator METHOD method_26973 addStructureReference (Lnet/minecraft/class_4076;Lnet/minecraft/class_3195;JLnet/minecraft/class_2810;)V ARG 1 pos ARG 2 feature @@ -38,3 +40,9 @@ CLASS net/minecraft/class_5138 net/minecraft/world/gen/StructureAccessor COMMENT child piece of it. ARG 1 pos ARG 2 structure + METHOD method_39783 getStructurePresence (Lnet/minecraft/class_1923;Lnet/minecraft/class_3195;Z)Lnet/minecraft/class_6833; + ARG 1 chunkPos + ARG 2 structure + ARG 3 skipExistingChunk + METHOD method_39784 incrementReferences (Lnet/minecraft/class_3449;)V + ARG 1 structureStart