22w13a worldgen (#3072)

* 22w13a worldgen

* Improve shnupbups PR conflict
This commit is contained in:
apple502j 2022-04-07 01:04:51 +09:00 committed by GitHub
parent b029eaf79c
commit 424de6e072
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 99 additions and 3 deletions

View File

@ -12,8 +12,12 @@ CLASS net/minecraft/class_6834 net/minecraft/structure/StructureGeneratorFactory
ARG 1 generator
CLASS class_6835 Context
FIELD comp_311 world Lnet/minecraft/class_5539;
FIELD comp_313 structureManager Lnet/minecraft/class_3485;
FIELD comp_314 registryManager Lnet/minecraft/class_5455;
FIELD comp_573 noiseConfig Lnet/minecraft/class_7138;
METHOD comp_311 world ()Lnet/minecraft/class_5539;
METHOD comp_313 structureManager ()Lnet/minecraft/class_3485;
METHOD comp_314 registryManager ()Lnet/minecraft/class_5455;
METHOD comp_573 noiseConfig ()Lnet/minecraft/class_7138;
METHOD method_39848 isBiomeValid (Lnet/minecraft/class_2902$class_2903;)Z
ARG 1 heightmapType

View File

@ -1,5 +1,18 @@
CLASS net/minecraft/class_3488 net/minecraft/structure/processor/BlockRotStructureProcessor
FIELD field_15523 integrity F
FIELD field_25000 CODEC Lcom/mojang/serialization/Codec;
FIELD field_38437 rottableBlocks Ljava/util/Optional;
METHOD <init> (F)V
ARG 1 integrity
METHOD <init> (Ljava/util/Optional;F)V
ARG 1 rottableBlocks
ARG 2 integrity
METHOD <init> (Lnet/minecraft/class_6862;F)V
ARG 1 rottableBlocks
ARG 2 integrity
METHOD method_42711 (Lcom/mojang/serialization/codecs/RecordCodecBuilder$Instance;)Lcom/mojang/datafixers/kinds/App;
ARG 0 instance
METHOD method_42712 (Lnet/minecraft/class_3488;)Ljava/lang/Float;
ARG 0 processor
METHOD method_42713 (Lnet/minecraft/class_3488;)Ljava/util/Optional;
ARG 0 processor

View File

@ -3,5 +3,7 @@ CLASS net/minecraft/class_3491 net/minecraft/structure/processor/StructureProces
ARG 1 world
ARG 2 pos
ARG 3 pivot
ARG 4 originalBlockInfo
ARG 5 currentBlockInfo
ARG 6 data
METHOD method_16772 getType ()Lnet/minecraft/class_3828;

View File

@ -1,2 +1,47 @@
CLASS net/minecraft/class_5434 net/minecraft/world/gen/feature/JigsawFeature
FIELD field_37794 CODEC Lcom/mojang/serialization/Codec;
FIELD field_37795 startPool Lnet/minecraft/class_6880;
FIELD field_37796 size I
FIELD field_37797 startHeight Lnet/minecraft/class_6122;
FIELD field_37798 useExpansionHack Z
FIELD field_37799 projectStartToHeightmap Ljava/util/Optional;
FIELD field_38268 maxDistanceFromCenter I
FIELD field_38435 MAX_SIZE I
METHOD <init> (Lnet/minecraft/class_3195$class_7302;Lnet/minecraft/class_6880;ILnet/minecraft/class_6122;Z)V
ARG 1 config
ARG 2 startPool
ARG 3 size
ARG 4 startHeight
ARG 5 useExpansionHack
METHOD <init> (Lnet/minecraft/class_3195$class_7302;Lnet/minecraft/class_6880;ILnet/minecraft/class_6122;ZLjava/util/Optional;I)V
ARG 1 config
ARG 2 startPool
ARG 3 size
ARG 4 startHeight
ARG 5 useExpansionHack
ARG 6 projectStartToHeightmap
ARG 7 maxDistanceFromCenter
METHOD <init> (Lnet/minecraft/class_3195$class_7302;Lnet/minecraft/class_6880;ILnet/minecraft/class_6122;ZLnet/minecraft/class_2902$class_2903;)V
ARG 1 config
ARG 2 startPool
ARG 3 size
ARG 4 startHeight
ARG 5 useExpansionHack
ARG 6 projectStartToHeightmap
METHOD method_41662 (Lcom/mojang/serialization/codecs/RecordCodecBuilder$Instance;)Lcom/mojang/datafixers/kinds/App;
ARG 0 instance
METHOD method_42703 (Lnet/minecraft/class_5434;)Lcom/mojang/serialization/DataResult;
ARG 0 feature
METHOD method_42704 (Lnet/minecraft/class_5434;)Ljava/lang/Integer;
ARG 0 feature
METHOD method_42705 (Lnet/minecraft/class_5434;)Ljava/util/Optional;
ARG 0 feature
METHOD method_42706 (Lnet/minecraft/class_5434;)Ljava/lang/Boolean;
ARG 0 feature
METHOD method_42707 (Lnet/minecraft/class_5434;)Lnet/minecraft/class_6122;
ARG 0 feature
METHOD method_42708 createValidator ()Ljava/util/function/Function;
METHOD method_42709 (Lnet/minecraft/class_5434;)Ljava/lang/Integer;
ARG 0 feature
METHOD method_42710 (Lnet/minecraft/class_5434;)Lnet/minecraft/class_6880;
ARG 0 feature

View File

@ -1,4 +1,6 @@
CLASS net/minecraft/class_3195 net/minecraft/world/gen/feature/StructureFeature
FIELD field_37744 FEATURE_CODEC Lcom/mojang/serialization/Codec;
FIELD field_37745 FEATURE_ENTRY_CODEC Lcom/mojang/serialization/Codec;
FIELD field_38429 config Lnet/minecraft/class_3195$class_7302;
METHOD <init> (Lnet/minecraft/class_3195$class_7302;)V
ARG 1 config
@ -15,15 +17,25 @@ CLASS net/minecraft/class_3195 net/minecraft/world/gen/feature/StructureFeature
METHOD method_41607 getValidBiomes ()Lnet/minecraft/class_6885;
METHOD method_41609 expandBoxIfShouldAdaptNoise (Lnet/minecraft/class_3341;)Lnet/minecraft/class_3341;
ARG 1 box
METHOD method_41610 getMinCornerHeight (Lnet/minecraft/class_3195$class_7149;II)I
ARG 0 context
ARG 1 width
ARG 2 height
METHOD method_41611 getCornerHeights (Lnet/minecraft/class_3195$class_7149;IIII)[I
ARG 0 context
ARG 1 x
ARG 2 width
ARG 3 z
ARG 4 height
METHOD method_41612 getStructurePosition (Lnet/minecraft/class_3195$class_7149;Lnet/minecraft/class_2902$class_2903;Ljava/util/function/Consumer;)Ljava/util/Optional;
ARG 0 context
ARG 1 heightmap
ARG 2 generator
METHOD method_41613 isBiomeValid (Lnet/minecraft/class_3195$class_7150;Lnet/minecraft/class_2794;Lnet/minecraft/class_7138;Ljava/util/function/Predicate;)Z
ARG 0 position
ARG 0 result
ARG 1 chunkGenerator
ARG 2 noiseConfig
ARG 3 biomePredicate
ARG 3 validBiomes
METHOD method_41614 createStructureStart (Lnet/minecraft/class_5455;Lnet/minecraft/class_2794;Lnet/minecraft/class_1966;Lnet/minecraft/class_7138;Lnet/minecraft/class_3485;JLnet/minecraft/class_1923;ILnet/minecraft/class_5539;Ljava/util/function/Predicate;)Lnet/minecraft/class_3449;
ARG 1 dynamicRegistryManager
ARG 2 chunkGenerator
@ -32,11 +44,29 @@ CLASS net/minecraft/class_3195 net/minecraft/world/gen/feature/StructureFeature
ARG 5 structureManager
ARG 6 seed
ARG 8 chunkPos
ARG 9 references
ARG 10 world
ARG 11 biomePredicate
ARG 11 validBiomes
METHOD method_41615 getStructureSpawns ()Ljava/util/Map;
METHOD method_41616 getFeatureGenerationStep ()Lnet/minecraft/class_2893$class_2895;
METHOD method_41618 getType ()Lnet/minecraft/class_7151;
METHOD method_42381 getMinCornerHeight (Lnet/minecraft/class_3195$class_7149;IIII)I
ARG 0 context
ARG 1 x
ARG 2 z
ARG 3 width
ARG 4 height
METHOD method_42382 getShiftedPos (Lnet/minecraft/class_3195$class_7149;Lnet/minecraft/class_2470;)Lnet/minecraft/class_2338;
ARG 1 context
ARG 2 rotation
METHOD method_42697 configCodecBuilder (Lcom/mojang/serialization/codecs/RecordCodecBuilder$Instance;)Lcom/mojang/serialization/codecs/RecordCodecBuilder;
ARG 0 instance
METHOD method_42698 (Lnet/minecraft/class_3195;)Lnet/minecraft/class_3195$class_7302;
ARG 0 feature
METHOD method_42699 createCodec (Ljava/util/function/Function;)Lcom/mojang/serialization/Codec;
ARG 0 featureCreator
METHOD method_42700 (Ljava/util/function/Function;Lcom/mojang/serialization/codecs/RecordCodecBuilder$Instance;)Lcom/mojang/datafixers/kinds/App;
ARG 1 instance
METHOD method_42701 getTerrainAdaptation ()Lnet/minecraft/class_5847;
CLASS class_7149 Context
FIELD comp_561 dynamicRegistryManager Lnet/minecraft/class_5455;
@ -65,3 +95,5 @@ CLASS net/minecraft/class_3195 net/minecraft/world/gen/feature/StructureFeature
CLASS class_7150 StructurePosition
CLASS class_7302 Config
FIELD field_38430 CODEC Lcom/mojang/serialization/MapCodec;
METHOD method_42702 (Lcom/mojang/serialization/codecs/RecordCodecBuilder$Instance;)Lcom/mojang/datafixers/kinds/App;
ARG 0 instance