22w14a de-featured structures (#3079)

* De-featured structures

Structures moved to own package, plus renames and extra stuff, now that they aren't features at all

* more

* renamed StructureType to clear up name collision
This commit is contained in:
Shnupbups 2022-04-14 02:23:27 +10:00 committed by GitHub
parent a96db03dd0
commit fbe4d7fc7f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
35 changed files with 175 additions and 53 deletions

View File

@ -12,7 +12,7 @@ CLASS net/minecraft/class_5458 net/minecraft/util/registry/BuiltinRegistries
FIELD field_25926 REGISTRIES Lnet/minecraft/class_2378;
FIELD field_25928 CONFIGURED_CARVER Lnet/minecraft/class_2378;
FIELD field_25929 CONFIGURED_FEATURE Lnet/minecraft/class_2378;
FIELD field_25930 CONFIGURED_STRUCTURE_FEATURE Lnet/minecraft/class_2378;
FIELD field_25930 STRUCTURE Lnet/minecraft/class_2378;
FIELD field_25931 STRUCTURE_PROCESSOR_LIST Lnet/minecraft/class_2378;
FIELD field_25932 STRUCTURE_POOL Lnet/minecraft/class_2378;
FIELD field_25933 BIOME Lnet/minecraft/class_2378;

View File

@ -113,7 +113,7 @@ CLASS net/minecraft/class_2378 net/minecraft/util/registry/Registry
COMMENT @see #WORLD_KEY
FIELD field_25913 CONFIGURED_CARVER_KEY Lnet/minecraft/class_5321;
FIELD field_25914 CONFIGURED_FEATURE_KEY Lnet/minecraft/class_5321;
FIELD field_25915 CONFIGURED_STRUCTURE_FEATURE_KEY Lnet/minecraft/class_5321;
FIELD field_25915 STRUCTURE_KEY Lnet/minecraft/class_5321;
FIELD field_25916 STRUCTURE_PROCESSOR_LIST_KEY Lnet/minecraft/class_5321;
FIELD field_25917 STRUCTURE_POOL_KEY Lnet/minecraft/class_5321;
FIELD field_26374 CHUNK_GENERATOR_SETTINGS_KEY Lnet/minecraft/class_5321;

View File

@ -1 +0,0 @@
CLASS net/minecraft/class_7147 net/minecraft/world/gen/feature/BasicTempleStructureFeature

View File

@ -1,4 +0,0 @@
CLASS net/minecraft/class_2956 net/minecraft/world/gen/feature/BuriedTreasureFeature
FIELD field_37790 CODEC Lcom/mojang/serialization/Codec;
METHOD method_38672 addPieces (Lnet/minecraft/class_6626;Lnet/minecraft/class_3195$class_7149;)V
ARG 0 collector

View File

@ -1,3 +0,0 @@
CLASS net/minecraft/class_7058 net/minecraft/world/gen/feature/ConfiguredStructureFeatureKeys
METHOD method_41142 of (Ljava/lang/String;)Lnet/minecraft/class_5321;
ARG 0 id

View File

@ -1,2 +0,0 @@
CLASS net/minecraft/class_3006 net/minecraft/world/gen/feature/DesertPyramidFeature
FIELD field_37791 CODEC Lcom/mojang/serialization/Codec;

View File

@ -1,4 +0,0 @@
CLASS net/minecraft/class_3021 net/minecraft/world/gen/feature/EndCityFeature
FIELD field_37792 CODEC Lcom/mojang/serialization/Codec;
METHOD method_39817 (Lnet/minecraft/class_6626;Lnet/minecraft/class_2338;Lnet/minecraft/class_2470;Lnet/minecraft/class_3195$class_7149;)V
ARG 1 collector

View File

@ -1,3 +0,0 @@
CLASS net/minecraft/class_3071 net/minecraft/world/gen/feature/IglooFeature
FIELD field_37793 CODEC Lcom/mojang/serialization/Codec;
METHOD method_38675 addPieces (Lnet/minecraft/class_6626;Lnet/minecraft/class_3195$class_7149;)V

View File

@ -1,2 +0,0 @@
CLASS net/minecraft/class_3076 net/minecraft/world/gen/feature/JungleTempleFeature
FIELD field_37800 CODEC Lcom/mojang/serialization/Codec;

View File

@ -1,2 +0,0 @@
CLASS net/minecraft/class_4785 net/minecraft/world/gen/feature/NetherFossilFeature
FIELD field_37804 CODEC Lcom/mojang/serialization/Codec;

View File

@ -1,9 +0,0 @@
CLASS net/minecraft/class_3411 net/minecraft/world/gen/feature/OceanRuinFeature
FIELD field_37807 CODEC Lcom/mojang/serialization/Codec;
METHOD method_38700 addPieces (Lnet/minecraft/class_6626;Lnet/minecraft/class_3195$class_7149;)V
CLASS class_3413 BiomeType
FIELD field_14529 name Ljava/lang/String;
FIELD field_24990 CODEC Lcom/mojang/serialization/Codec;
METHOD <init> (Ljava/lang/String;ILjava/lang/String;)V
ARG 3 name
METHOD method_14831 getName ()Ljava/lang/String;

View File

@ -1,3 +0,0 @@
CLASS net/minecraft/class_3170 net/minecraft/world/gen/feature/ShipwreckFeature
FIELD field_37815 CODEC Lcom/mojang/serialization/Codec;
METHOD method_38685 addPieces (Lnet/minecraft/class_6626;Lnet/minecraft/class_3195$class_7149;)V

View File

@ -1,3 +0,0 @@
CLASS net/minecraft/class_3188 net/minecraft/world/gen/feature/StrongholdFeature
FIELD field_37817 CODEC Lcom/mojang/serialization/Codec;
METHOD method_41691 addPieces (Lnet/minecraft/class_6626;Lnet/minecraft/class_3195$class_7149;)V

View File

@ -1,4 +0,0 @@
CLASS net/minecraft/class_3197 net/minecraft/world/gen/feature/SwampHutFeature
FIELD field_37818 CODEC Lcom/mojang/serialization/Codec;
METHOD method_38693 addPieces (Lnet/minecraft/class_6626;Lnet/minecraft/class_3195$class_7149;)V
ARG 0 collector

View File

@ -1,2 +0,0 @@
CLASS net/minecraft/class_3223 net/minecraft/world/gen/feature/WoodlandMansionFeature
FIELD field_37819 CODEC Lcom/mojang/serialization/Codec;

View File

@ -0,0 +1,19 @@
CLASS net/minecraft/class_7147 net/minecraft/world/gen/structure/BasicTempleStructure
FIELD field_37741 constructor Lnet/minecraft/class_7147$class_7148;
FIELD field_37742 width I
FIELD field_37743 height I
METHOD <init> (Lnet/minecraft/class_7147$class_7148;IILnet/minecraft/class_3195$class_7302;)V
ARG 1 constructor
ARG 2 width
ARG 3 height
ARG 4 config
METHOD method_41605 (Lnet/minecraft/class_3195$class_7149;Lnet/minecraft/class_6626;)V
ARG 2 collector
METHOD method_41606 addPieces (Lnet/minecraft/class_6626;Lnet/minecraft/class_3195$class_7149;)V
ARG 1 collector
ARG 2 context
CLASS class_7148 Constructor
METHOD construct (Lnet/minecraft/class_2919;II)Lnet/minecraft/class_3443;
ARG 1 random
ARG 2 startX
ARG 3 startZ

View File

@ -0,0 +1,7 @@
CLASS net/minecraft/class_2956 net/minecraft/world/gen/structure/BuriedTreasureStructure
FIELD field_37790 CODEC Lcom/mojang/serialization/Codec;
METHOD method_38672 addPieces (Lnet/minecraft/class_6626;Lnet/minecraft/class_3195$class_7149;)V
ARG 0 collector
ARG 1 context
METHOD method_41652 (Lnet/minecraft/class_3195$class_7149;Lnet/minecraft/class_6626;)V
ARG 1 collector

View File

@ -0,0 +1,2 @@
CLASS net/minecraft/class_3006 net/minecraft/world/gen/structure/DesertPyramidStructure
FIELD field_37791 CODEC Lcom/mojang/serialization/Codec;

View File

@ -0,0 +1,9 @@
CLASS net/minecraft/class_3021 net/minecraft/world/gen/structure/EndCityStructure
FIELD field_37792 CODEC Lcom/mojang/serialization/Codec;
METHOD method_39817 addPieces (Lnet/minecraft/class_6626;Lnet/minecraft/class_2338;Lnet/minecraft/class_2470;Lnet/minecraft/class_3195$class_7149;)V
ARG 1 collector
ARG 2 pos
ARG 3 rotation
ARG 4 context
METHOD method_41655 (Lnet/minecraft/class_2338;Lnet/minecraft/class_2470;Lnet/minecraft/class_3195$class_7149;Lnet/minecraft/class_6626;)V
ARG 4 collector

View File

@ -0,0 +1,7 @@
CLASS net/minecraft/class_3071 net/minecraft/world/gen/structure/IglooStructure
FIELD field_37793 CODEC Lcom/mojang/serialization/Codec;
METHOD method_38675 addPieces (Lnet/minecraft/class_6626;Lnet/minecraft/class_3195$class_7149;)V
ARG 1 collector
ARG 2 context
METHOD method_41657 (Lnet/minecraft/class_3195$class_7149;Lnet/minecraft/class_6626;)V
ARG 2 collector

View File

@ -1,4 +1,4 @@
CLASS net/minecraft/class_5434 net/minecraft/world/gen/feature/JigsawFeature
CLASS net/minecraft/class_5434 net/minecraft/world/gen/structure/JigsawStructure
FIELD field_37794 CODEC Lcom/mojang/serialization/Codec;
FIELD field_37795 startPool Lnet/minecraft/class_6880;
FIELD field_37796 size I

View File

@ -0,0 +1,2 @@
CLASS net/minecraft/class_3076 net/minecraft/world/gen/structure/JungleTempleStructure
FIELD field_37800 CODEC Lcom/mojang/serialization/Codec;

View File

@ -1,6 +1,15 @@
CLASS net/minecraft/class_3098 net/minecraft/world/gen/feature/MineshaftFeature
CLASS net/minecraft/class_3098 net/minecraft/world/gen/structure/MineshaftStructure
FIELD field_37801 CODEC Lcom/mojang/serialization/Codec;
FIELD field_37802 type Lnet/minecraft/class_3098$class_3100;
METHOD <init> (Lnet/minecraft/class_3195$class_7302;Lnet/minecraft/class_3098$class_3100;)V
ARG 1 config
ARG 2 type
METHOD method_38678 addPieces (Lnet/minecraft/class_6626;Lnet/minecraft/class_2338;Lnet/minecraft/class_3195$class_7149;)V
ARG 1 collector
ARG 2 pos
ARG 3 context
METHOD method_41668 (Lnet/minecraft/class_2338;Lnet/minecraft/class_3195$class_7149;Lnet/minecraft/class_6626;)V
ARG 3 collector
CLASS class_3100 Type
FIELD field_13689 name Ljava/lang/String;
FIELD field_24839 CODEC Lcom/mojang/serialization/Codec;

View File

@ -1,5 +1,8 @@
CLASS net/minecraft/class_3108 net/minecraft/world/gen/feature/NetherFortressFeature
CLASS net/minecraft/class_3108 net/minecraft/world/gen/structure/NetherFortressStructure
FIELD field_13705 MONSTER_SPAWNS Lnet/minecraft/class_6012;
FIELD field_37803 CODEC Lcom/mojang/serialization/Codec;
METHOD method_38679 addPieces (Lnet/minecraft/class_6626;Lnet/minecraft/class_3195$class_7149;)V
ARG 0 collector
ARG 1 context
METHOD method_41670 (Lnet/minecraft/class_3195$class_7149;Lnet/minecraft/class_6626;)V
ARG 1 collector

View File

@ -0,0 +1,10 @@
CLASS net/minecraft/class_4785 net/minecraft/world/gen/structure/NetherFossilStructure
FIELD field_37804 CODEC Lcom/mojang/serialization/Codec;
FIELD field_37805 height Lnet/minecraft/class_6122;
METHOD <init> (Lnet/minecraft/class_3195$class_7302;Lnet/minecraft/class_6122;)V
ARG 1 config
ARG 2 height
METHOD method_41672 (Lnet/minecraft/class_3195$class_7149;Lnet/minecraft/class_2919;Lnet/minecraft/class_2338;Lnet/minecraft/class_6626;)V
ARG 0 collector
METHOD method_41673 (Lnet/minecraft/class_4785;)Lnet/minecraft/class_6122;
ARG 0 structure

View File

@ -1,4 +1,4 @@
CLASS net/minecraft/class_3116 net/minecraft/world/gen/feature/OceanMonumentFeature
CLASS net/minecraft/class_3116 net/minecraft/world/gen/structure/OceanMonumentStructure
FIELD field_37806 CODEC Lcom/mojang/serialization/Codec;
METHOD method_38680 modifyPiecesOnRead (Lnet/minecraft/class_1923;JLnet/minecraft/class_6624;)Lnet/minecraft/class_6624;
ARG 0 pos
@ -9,3 +9,6 @@ CLASS net/minecraft/class_3116 net/minecraft/world/gen/feature/OceanMonumentFeat
ARG 1 random
METHOD method_38683 addPieces (Lnet/minecraft/class_6626;Lnet/minecraft/class_3195$class_7149;)V
ARG 0 collector
ARG 1 context
METHOD method_41675 (Lnet/minecraft/class_3195$class_7149;Lnet/minecraft/class_6626;)V
ARG 1 collector

View File

@ -0,0 +1,27 @@
CLASS net/minecraft/class_3411 net/minecraft/world/gen/structure/OceanRuinStructure
FIELD field_37807 CODEC Lcom/mojang/serialization/Codec;
FIELD field_37808 biomeTemperature Lnet/minecraft/class_3411$class_3413;
FIELD field_37809 largeProbability F
FIELD field_37810 clusterProbability F
METHOD <init> (Lnet/minecraft/class_3195$class_7302;Lnet/minecraft/class_3411$class_3413;FF)V
ARG 1 config
ARG 2 biomeTemperature
ARG 3 largeProbability
ARG 4 clusterProbability
METHOD method_38700 addPieces (Lnet/minecraft/class_6626;Lnet/minecraft/class_3195$class_7149;)V
ARG 1 collector
ARG 2 context
METHOD method_41677 (Lnet/minecraft/class_3195$class_7149;Lnet/minecraft/class_6626;)V
ARG 2 collector
METHOD method_41678 (Lnet/minecraft/class_3411;)Ljava/lang/Float;
ARG 0 structure
METHOD method_41680 (Lnet/minecraft/class_3411;)Ljava/lang/Float;
ARG 0 structure
METHOD method_41681 (Lnet/minecraft/class_3411;)Lnet/minecraft/class_3411$class_3413;
ARG 0 structure
CLASS class_3413 BiomeTemperature
FIELD field_14529 name Ljava/lang/String;
FIELD field_24990 CODEC Lcom/mojang/serialization/Codec;
METHOD <init> (Ljava/lang/String;ILjava/lang/String;)V
ARG 3 name
METHOD method_14831 getName ()Ljava/lang/String;

View File

@ -1,14 +1,23 @@
CLASS net/minecraft/class_5183 net/minecraft/world/gen/feature/RuinedPortalFeature
CLASS net/minecraft/class_5183 net/minecraft/world/gen/structure/RuinedPortalStructure
FIELD field_23998 RARE_PORTAL_STRUCTURE_IDS [Ljava/lang/String;
FIELD field_23999 COMMON_PORTAL_STRUCTURE_IDS [Ljava/lang/String;
FIELD field_37812 CODEC Lcom/mojang/serialization/Codec;
FIELD field_37813 setups Ljava/util/List;
METHOD <init> (Lnet/minecraft/class_3195$class_7302;Ljava/util/List;)V
ARG 1 config
ARG 2 setups
METHOD <init> (Lnet/minecraft/class_3195$class_7302;Lnet/minecraft/class_5183$class_7155;)V
ARG 1 config
ARG 2 setup
METHOD method_27209 isColdAt (Lnet/minecraft/class_2338;Lnet/minecraft/class_6880;)Z
ARG 0 pos
ARG 1 biome
METHOD method_27210 choosePlacementHeight (Lnet/minecraft/class_5819;II)I
ARG 0 random
ARG 1 min
ARG 2 max
METHOD method_27211 getFloorHeight (Lnet/minecraft/class_5819;Lnet/minecraft/class_2794;Lnet/minecraft/class_5189$class_5191;ZIILnet/minecraft/class_3341;Lnet/minecraft/class_5539;Lnet/minecraft/class_7138;)I
ARG 0 random
ARG 1 chunkGenerator
ARG 2 verticalPlacement
ARG 3 airPocket
@ -16,3 +25,7 @@ CLASS net/minecraft/class_5183 net/minecraft/world/gen/feature/RuinedPortalFeatu
ARG 5 blockCountY
ARG 6 box
ARG 7 world
ARG 8 noiseConfig
METHOD method_41684 (Lnet/minecraft/class_5183;)Ljava/util/List;
ARG 0 structure
CLASS class_7155 Setup

View File

@ -0,0 +1,11 @@
CLASS net/minecraft/class_3170 net/minecraft/world/gen/structure/ShipwreckStructure
FIELD field_37815 CODEC Lcom/mojang/serialization/Codec;
FIELD field_37816 beached Z
METHOD <init> (Lnet/minecraft/class_3195$class_7302;Z)V
ARG 1 config
ARG 2 beached
METHOD method_38685 addPieces (Lnet/minecraft/class_6626;Lnet/minecraft/class_3195$class_7149;)V
ARG 1 collector
ARG 2 context
METHOD method_41687 (Lnet/minecraft/class_3195$class_7149;Lnet/minecraft/class_6626;)V
ARG 2 collector

View File

@ -0,0 +1,7 @@
CLASS net/minecraft/class_3188 net/minecraft/world/gen/structure/StrongholdStructure
FIELD field_37817 CODEC Lcom/mojang/serialization/Codec;
METHOD method_41690 (Lnet/minecraft/class_3195$class_7149;Lnet/minecraft/class_6626;)V
ARG 1 collector
METHOD method_41691 addPieces (Lnet/minecraft/class_6626;Lnet/minecraft/class_3195$class_7149;)V
ARG 0 collector
ARG 1 context

View File

@ -1,6 +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;
CLASS net/minecraft/class_3195 net/minecraft/world/gen/structure/StructureType
FIELD field_37744 STRUCTURE_TYPE_CODEC Lcom/mojang/serialization/Codec;
FIELD field_37745 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
@ -10,6 +10,7 @@ CLASS net/minecraft/class_3195 net/minecraft/world/gen/feature/StructureFeature
ARG 1 world
ARG 2 structureAccessor
ARG 3 chunkGenerator
ARG 4 random
ARG 5 box
ARG 6 chunkPos
ARG 7 pieces

View File

@ -0,0 +1,3 @@
CLASS net/minecraft/class_7058 net/minecraft/world/gen/structure/StructureTypeKeys
METHOD method_41142 of (Ljava/lang/String;)Lnet/minecraft/class_5321;
ARG 0 id

View File

@ -1,4 +1,4 @@
CLASS net/minecraft/class_5470 net/minecraft/world/gen/feature/ConfiguredStructureFeatures
CLASS net/minecraft/class_5470 net/minecraft/world/gen/structure/StructureTypes
FIELD field_26287 RUINED_PORTAL_JUNGLE Lnet/minecraft/class_6880;
FIELD field_26288 RUINED_PORTAL_SWAMP Lnet/minecraft/class_6880;
FIELD field_26289 RUINED_PORTAL_MOUNTAIN Lnet/minecraft/class_6880;
@ -30,7 +30,22 @@ CLASS net/minecraft/class_5470 net/minecraft/world/gen/feature/ConfiguredStructu
FIELD field_26315 VILLAGE_TAIGA Lnet/minecraft/class_6880;
FIELD field_26316 RUINED_PORTAL Lnet/minecraft/class_6880;
FIELD field_26317 RUINED_PORTAL_DESERT Lnet/minecraft/class_6880;
FIELD field_38476 ANCIENT_CITY Lnet/minecraft/class_6880;
METHOD method_30603 register (Lnet/minecraft/class_5321;Lnet/minecraft/class_3195;)Lnet/minecraft/class_6880;
ARG 0 key
ARG 1 configuredStructureFeature
METHOD method_38569 getDefault ()Lnet/minecraft/class_6880;
METHOD method_42044 getOrCreateBiomeTag (Lnet/minecraft/class_6862;)Lnet/minecraft/class_6885;
ARG 0 key
METHOD method_42757 createConfig (Lnet/minecraft/class_6862;Lnet/minecraft/class_2893$class_2895;Lnet/minecraft/class_5847;)Lnet/minecraft/class_3195$class_7302;
ARG 0 biomeTag
ARG 1 featureStep
ARG 2 terrainAdaptation
METHOD method_42758 createConfig (Lnet/minecraft/class_6862;Lnet/minecraft/class_5847;)Lnet/minecraft/class_3195$class_7302;
ARG 0 biomeTag
ARG 1 terrainAdaptation
METHOD method_42759 createConfig (Lnet/minecraft/class_6862;Ljava/util/Map;Lnet/minecraft/class_2893$class_2895;Lnet/minecraft/class_5847;)Lnet/minecraft/class_3195$class_7302;
ARG 0 biomeTag
ARG 1 spawns
ARG 2 featureStep
ARG 3 terrainAdaptation

View File

@ -0,0 +1,7 @@
CLASS net/minecraft/class_3197 net/minecraft/world/gen/structure/SwampHutStructure
FIELD field_37818 CODEC Lcom/mojang/serialization/Codec;
METHOD method_38693 addPieces (Lnet/minecraft/class_6626;Lnet/minecraft/class_3195$class_7149;)V
ARG 0 collector
ARG 1 context
METHOD method_41693 (Lnet/minecraft/class_3195$class_7149;Lnet/minecraft/class_6626;)V
ARG 1 collector

View File

@ -0,0 +1,9 @@
CLASS net/minecraft/class_3223 net/minecraft/world/gen/structure/WoodlandMansionStructure
FIELD field_37819 CODEC Lcom/mojang/serialization/Codec;
METHOD method_41695 (Lnet/minecraft/class_3195$class_7149;Lnet/minecraft/class_2338;Lnet/minecraft/class_2470;Lnet/minecraft/class_6626;)V
ARG 4 collector
METHOD method_41696 addPieces (Lnet/minecraft/class_6626;Lnet/minecraft/class_3195$class_7149;Lnet/minecraft/class_2338;Lnet/minecraft/class_2470;)V
ARG 1 collector
ARG 2 context
ARG 3 pos
ARG 4 rotation