From 9a3618695cfc56735eb0fef2dda28bbe893e2406 Mon Sep 17 00:00:00 2001 From: Shnupbups Date: Thu, 31 Mar 2022 00:02:05 +1100 Subject: [PATCH] 22w12a just a bit more (#3069) --- .../ai/brain/task/FrogEatEntityTask.mapping | 8 ++++++++ .../entity/passive/VillagerEntity.mapping | 1 + .../gen/chunk/GenerationShapeConfig.mapping | 7 +++++++ .../world/gen/chunk/NoiseChunkGenerator.mapping | 4 ++++ .../gen/densityfunction/DensityFunctions.mapping | 7 +++++++ .../gen/surfacebuilder/MaterialRules.mapping | 16 ++++++++++++++++ .../gen/surfacebuilder/SurfaceBuilder.mapping | 10 ++++++++++ 7 files changed, 53 insertions(+) diff --git a/mappings/net/minecraft/entity/ai/brain/task/FrogEatEntityTask.mapping b/mappings/net/minecraft/entity/ai/brain/task/FrogEatEntityTask.mapping index 815e36f084..870683d031 100644 --- a/mappings/net/minecraft/entity/ai/brain/task/FrogEatEntityTask.mapping +++ b/mappings/net/minecraft/entity/ai/brain/task/FrogEatEntityTask.mapping @@ -1,4 +1,12 @@ CLASS net/minecraft/class_7108 net/minecraft/entity/ai/brain/task/FrogEatEntityTask + FIELD field_37485 tongueSound Lnet/minecraft/class_3414; + FIELD field_37486 eatSound Lnet/minecraft/class_3414; + FIELD field_37487 targetPos Lnet/minecraft/class_243; + FIELD field_37489 phase Lnet/minecraft/class_7108$class_7109; + METHOD (Lnet/minecraft/class_3414;Lnet/minecraft/class_3414;)V + ARG 1 tongueSound + ARG 2 eatSound METHOD method_41386 createDroppedStack (Lnet/minecraft/class_7102;Lnet/minecraft/class_1297;)Lnet/minecraft/class_1799; ARG 0 frog ARG 1 eatenEntity + CLASS class_7109 Phase diff --git a/mappings/net/minecraft/entity/passive/VillagerEntity.mapping b/mappings/net/minecraft/entity/passive/VillagerEntity.mapping index 9f99ba3aca..9e8a8a51f3 100644 --- a/mappings/net/minecraft/entity/passive/VillagerEntity.mapping +++ b/mappings/net/minecraft/entity/passive/VillagerEntity.mapping @@ -70,6 +70,7 @@ CLASS net/minecraft/class_1646 net/minecraft/entity/passive/VillagerEntity METHOD method_20687 canSummonGolem (J)Z ARG 1 time METHOD method_20688 summonGolem (Lnet/minecraft/class_3218;JI)V + ARG 1 world ARG 2 time ARG 4 requiredCount METHOD method_20690 notifyDeath (Lnet/minecraft/class_1297;)V diff --git a/mappings/net/minecraft/world/gen/chunk/GenerationShapeConfig.mapping b/mappings/net/minecraft/world/gen/chunk/GenerationShapeConfig.mapping index 04baddf64c..5c25df750c 100644 --- a/mappings/net/minecraft/world/gen/chunk/GenerationShapeConfig.mapping +++ b/mappings/net/minecraft/world/gen/chunk/GenerationShapeConfig.mapping @@ -4,6 +4,11 @@ CLASS net/minecraft/class_5309 net/minecraft/world/gen/chunk/GenerationShapeConf FIELD comp_178 horizontalSize I FIELD comp_179 verticalSize I FIELD field_24804 CODEC Lcom/mojang/serialization/Codec; + FIELD field_37138 NETHER Lnet/minecraft/class_5309; + FIELD field_37139 END Lnet/minecraft/class_5309; + FIELD field_37140 CAVES Lnet/minecraft/class_5309; + FIELD field_37141 FLOATING_ISLANDS Lnet/minecraft/class_5309; + FIELD field_38253 SURFACE Lnet/minecraft/class_5309; METHOD (IIII)V ARG 1 minimumY ARG 2 height @@ -16,6 +21,8 @@ CLASS net/minecraft/class_5309 net/minecraft/world/gen/chunk/GenerationShapeConf METHOD method_32994 create (IIII)Lnet/minecraft/class_5309; ARG 0 minimumY ARG 1 height + ARG 2 horizontalSize + ARG 3 verticalSize METHOD method_32995 checkHeight (Lnet/minecraft/class_5309;)Lcom/mojang/serialization/DataResult; ARG 0 config METHOD method_39545 verticalBlockSize ()I diff --git a/mappings/net/minecraft/world/gen/chunk/NoiseChunkGenerator.mapping b/mappings/net/minecraft/world/gen/chunk/NoiseChunkGenerator.mapping index 731b09f090..86cb1c1f96 100644 --- a/mappings/net/minecraft/world/gen/chunk/NoiseChunkGenerator.mapping +++ b/mappings/net/minecraft/world/gen/chunk/NoiseChunkGenerator.mapping @@ -25,6 +25,8 @@ CLASS net/minecraft/class_3754 net/minecraft/world/gen/chunk/NoiseChunkGenerator METHOD method_33754 populateNoise (Lnet/minecraft/class_6748;Lnet/minecraft/class_5138;Lnet/minecraft/class_7138;Lnet/minecraft/class_2791;II)Lnet/minecraft/class_2791; ARG 1 blender ARG 2 structureAccessor + ARG 3 noiseConfig + ARG 4 chunk METHOD method_38323 getBlockState (Lnet/minecraft/class_6568;IIILnet/minecraft/class_2680;)Lnet/minecraft/class_2680; ARG 1 chunkNoiseSampler ARG 2 x @@ -39,3 +41,5 @@ CLASS net/minecraft/class_3754 net/minecraft/world/gen/chunk/NoiseChunkGenerator ARG 1 blender METHOD method_39172 (Lnet/minecraft/class_3754;)Lnet/minecraft/class_2378; ARG 0 generator + METHOD method_41536 (Lnet/minecraft/class_5138;Lnet/minecraft/class_6748;Lnet/minecraft/class_7138;Lnet/minecraft/class_2791;)Lnet/minecraft/class_6568; + ARG 4 chunk diff --git a/mappings/net/minecraft/world/gen/densityfunction/DensityFunctions.mapping b/mappings/net/minecraft/world/gen/densityfunction/DensityFunctions.mapping index 4a1989a8cf..459b4877f3 100644 --- a/mappings/net/minecraft/world/gen/densityfunction/DensityFunctions.mapping +++ b/mappings/net/minecraft/world/gen/densityfunction/DensityFunctions.mapping @@ -1,10 +1,17 @@ CLASS net/minecraft/class_6954 net/minecraft/world/gen/densityfunction/DensityFunctions METHOD method_41100 init ()Lnet/minecraft/class_6880; + METHOD method_41103 createSurfaceNoiseRouter (ZZ)Lnet/minecraft/class_6953; + ARG 0 largeBiomes + ARG 1 amplified METHOD method_41109 of (Ljava/lang/String;)Lnet/minecraft/class_5321; ARG 0 id METHOD method_41112 register (Lnet/minecraft/class_5321;Lnet/minecraft/class_6910;)Lnet/minecraft/class_6880; ARG 0 key ARG 1 function + METHOD method_41118 createNetherNoiseRouter ()Lnet/minecraft/class_6953; + METHOD method_41120 createEndNoiseRouter ()Lnet/minecraft/class_6953; + METHOD method_41549 createCavesNoiseRouter ()Lnet/minecraft/class_6953; + METHOD method_41552 createFloatingIslandsNoiseRouter ()Lnet/minecraft/class_6953; CLASS class_5841 CaveScaler METHOD method_33835 scaleCaves (D)D ARG 0 value diff --git a/mappings/net/minecraft/world/gen/surfacebuilder/MaterialRules.mapping b/mappings/net/minecraft/world/gen/surfacebuilder/MaterialRules.mapping index a0c642e9ea..7dfc58c9bd 100644 --- a/mappings/net/minecraft/world/gen/surfacebuilder/MaterialRules.mapping +++ b/mappings/net/minecraft/world/gen/surfacebuilder/MaterialRules.mapping @@ -55,12 +55,20 @@ CLASS net/minecraft/class_6686 net/minecraft/world/gen/surfacebuilder/MaterialRu ARG 1 addSurfaceDepth ARG 2 secondaryDepthRange ARG 3 verticalSurfaceType + METHOD method_42377 register (Lnet/minecraft/class_2378;Ljava/lang/String;Lnet/minecraft/class_7243;)Lcom/mojang/serialization/Codec; + ARG 0 registry + ARG 1 id + ARG 2 codecHolder CLASS class_6687 TerracottaBandsMaterialRule FIELD field_35226 RULE_CODEC Lnet/minecraft/class_7243; METHOD apply (Ljava/lang/Object;)Ljava/lang/Object; ARG 1 context CLASS class_6689 BiomeMaterialCondition FIELD field_35228 CONDITION_CODEC Lnet/minecraft/class_7243; + FIELD field_36414 biomes Ljava/util/List; + FIELD field_36415 predicate Ljava/util/function/Predicate; + METHOD (Ljava/util/List;)V + ARG 1 biomes METHOD apply (Ljava/lang/Object;)Ljava/lang/Object; ARG 1 context CLASS class_6690 BiomePredicate @@ -76,6 +84,7 @@ CLASS net/minecraft/class_6686 net/minecraft/world/gen/surfacebuilder/MaterialRu FIELD field_35232 CODEC Lcom/mojang/serialization/Codec; METHOD method_39064 codec ()Lnet/minecraft/class_7243; METHOD method_39070 registerAndGetDefault (Lnet/minecraft/class_2378;)Lcom/mojang/serialization/Codec; + ARG 0 registry CLASS class_6694 MaterialRuleContext FIELD field_35233 surfaceBuilder Lnet/minecraft/class_6724; FIELD field_35234 biomeTemperaturePredicate Lnet/minecraft/class_6686$class_6692; @@ -98,8 +107,14 @@ CLASS net/minecraft/class_6686 net/minecraft/world/gen/surfacebuilder/MaterialRu FIELD field_35619 stoneDepthBelow I FIELD field_35620 stoneDepthAbove I FIELD field_35676 chunkNoiseSampler Lnet/minecraft/class_6568; + FIELD field_37703 noiseConfig Lnet/minecraft/class_7138; METHOD (Lnet/minecraft/class_6724;Lnet/minecraft/class_7138;Lnet/minecraft/class_2791;Lnet/minecraft/class_6568;Ljava/util/function/Function;Lnet/minecraft/class_2378;Lnet/minecraft/class_5868;)V ARG 1 surfaceBuilder + ARG 2 noiseConfig + ARG 3 chunk + ARG 4 chunkNoiseSampler + ARG 5 posToBiome + ARG 7 heightContext METHOD method_39072 initHorizontalContext (II)V ARG 1 x ARG 2 z @@ -144,6 +159,7 @@ CLASS net/minecraft/class_6686 net/minecraft/world/gen/surfacebuilder/MaterialRu FIELD field_35252 CODEC Lcom/mojang/serialization/Codec; METHOD method_39061 codec ()Lnet/minecraft/class_7243; METHOD method_39085 registerAndGetDefault (Lnet/minecraft/class_2378;)Lcom/mojang/serialization/Codec; + ARG 0 registry CLASS class_6709 SequenceBlockStateRule COMMENT Applies the given block state rules in sequence, and returns the first result that COMMENT isn't {@code null}. Returns {@code null} if none of the passed rules match. diff --git a/mappings/net/minecraft/world/gen/surfacebuilder/SurfaceBuilder.mapping b/mappings/net/minecraft/world/gen/surfacebuilder/SurfaceBuilder.mapping index 6d271ca617..d5d83172ee 100644 --- a/mappings/net/minecraft/world/gen/surfacebuilder/SurfaceBuilder.mapping +++ b/mappings/net/minecraft/world/gen/surfacebuilder/SurfaceBuilder.mapping @@ -22,8 +22,10 @@ CLASS net/minecraft/class_6724 net/minecraft/world/gen/surfacebuilder/SurfaceBui FIELD field_35500 icebergSurfaceNoise Lnet/minecraft/class_5216; FIELD field_35680 surfaceSecondaryNoise Lnet/minecraft/class_5216; METHOD (Lnet/minecraft/class_7138;Lnet/minecraft/class_2680;ILnet/minecraft/class_6574;)V + ARG 1 noiseConfig ARG 2 defaultState ARG 3 seaLevel + ARG 4 randomDeriver METHOD method_39102 placeBadlandsPillar (Lnet/minecraft/class_6557;IIILnet/minecraft/class_5539;)V ARG 1 column ARG 2 x @@ -43,6 +45,14 @@ CLASS net/minecraft/class_6724 net/minecraft/world/gen/surfacebuilder/SurfaceBui ARG 6 z ARG 7 surfaceY METHOD method_39106 buildSurface (Lnet/minecraft/class_7138;Lnet/minecraft/class_4543;Lnet/minecraft/class_2378;ZLnet/minecraft/class_5868;Lnet/minecraft/class_2791;Lnet/minecraft/class_6568;Lnet/minecraft/class_6686$class_6708;)V + ARG 1 noiseConfig + ARG 2 biomeAccess + ARG 3 biomeRegistry + ARG 4 useLegacyRandom + ARG 5 heightContext + ARG 6 chunk + ARG 7 chunkNoiseSampler + ARG 8 materialRule METHOD method_39108 createTerracottaBands (Lnet/minecraft/class_5819;)[Lnet/minecraft/class_2680; ARG 0 random METHOD method_39109 addTerracottaBands (Lnet/minecraft/class_5819;[Lnet/minecraft/class_2680;ILnet/minecraft/class_2680;)V