From 1dc294f26754c549899c0eb3d0832ae0e8011466 Mon Sep 17 00:00:00 2001 From: Yanis48 Date: Thu, 6 Aug 2020 19:25:32 +0200 Subject: [PATCH] Made builtin registries match existing names (#1661) * Made builtin registries match existing names * mistakes --- ...tePools.mapping => StructurePools.mapping} | 2 +- ...mapping => StructureProcessorList.mapping} | 2 +- ...apping => StructureProcessorLists.mapping} | 2 +- .../util/registry/BuiltinRegistries.mapping | 4 ++-- .../net/minecraft/world/biome/Biome.mapping | 2 +- .../world/biome/SpawnSettings.mapping | 4 ++-- .../world/dimension/DimensionType.mapping | 1 + .../gen/chunk/ChunkGeneratorSettings.mapping | 24 ++++++++++++++++++- 8 files changed, 32 insertions(+), 9 deletions(-) rename mappings/net/minecraft/structure/pool/{TemplatePools.mapping => StructurePools.mapping} (78%) rename mappings/net/minecraft/structure/processor/{ProcessorList.mapping => StructureProcessorList.mapping} (89%) rename mappings/net/minecraft/structure/processor/{ProcessorLists.mapping => StructureProcessorLists.mapping} (89%) diff --git a/mappings/net/minecraft/structure/pool/TemplatePools.mapping b/mappings/net/minecraft/structure/pool/StructurePools.mapping similarity index 78% rename from mappings/net/minecraft/structure/pool/TemplatePools.mapping rename to mappings/net/minecraft/structure/pool/StructurePools.mapping index f2b97773b3..6e4ef2465b 100644 --- a/mappings/net/minecraft/structure/pool/TemplatePools.mapping +++ b/mappings/net/minecraft/structure/pool/StructurePools.mapping @@ -1,4 +1,4 @@ -CLASS net/minecraft/class_5468 net/minecraft/structure/pool/TemplatePools +CLASS net/minecraft/class_5468 net/minecraft/structure/pool/StructurePools FIELD field_26254 EMPTY Lnet/minecraft/class_5321; FIELD field_26255 INVALID Lnet/minecraft/class_3785; METHOD method_30599 initDefaultPools ()Lnet/minecraft/class_3785; diff --git a/mappings/net/minecraft/structure/processor/ProcessorList.mapping b/mappings/net/minecraft/structure/processor/StructureProcessorList.mapping similarity index 89% rename from mappings/net/minecraft/structure/processor/ProcessorList.mapping rename to mappings/net/minecraft/structure/processor/StructureProcessorList.mapping index 8b381e89cd..4b94dc2ab5 100644 --- a/mappings/net/minecraft/structure/processor/ProcessorList.mapping +++ b/mappings/net/minecraft/structure/processor/StructureProcessorList.mapping @@ -1,4 +1,4 @@ -CLASS net/minecraft/class_5497 net/minecraft/structure/processor/ProcessorList +CLASS net/minecraft/class_5497 net/minecraft/structure/processor/StructureProcessorList FIELD field_26662 list Ljava/util/List; METHOD (Ljava/util/List;)V ARG 1 list diff --git a/mappings/net/minecraft/structure/processor/ProcessorLists.mapping b/mappings/net/minecraft/structure/processor/StructureProcessorLists.mapping similarity index 89% rename from mappings/net/minecraft/structure/processor/ProcessorLists.mapping rename to mappings/net/minecraft/structure/processor/StructureProcessorLists.mapping index cd29fb0121..71aa9de89d 100644 --- a/mappings/net/minecraft/structure/processor/ProcessorLists.mapping +++ b/mappings/net/minecraft/structure/processor/StructureProcessorLists.mapping @@ -1,4 +1,4 @@ -CLASS net/minecraft/class_5469 net/minecraft/structure/processor/ProcessorLists +CLASS net/minecraft/class_5469 net/minecraft/structure/processor/StructureProcessorLists METHOD method_30601 register (Ljava/lang/String;Lcom/google/common/collect/ImmutableList;)Lnet/minecraft/class_5497; ARG 0 id ARG 1 processorList diff --git a/mappings/net/minecraft/util/registry/BuiltinRegistries.mapping b/mappings/net/minecraft/util/registry/BuiltinRegistries.mapping index cc201922fa..13435d066c 100644 --- a/mappings/net/minecraft/util/registry/BuiltinRegistries.mapping +++ b/mappings/net/minecraft/util/registry/BuiltinRegistries.mapping @@ -7,8 +7,8 @@ CLASS net/minecraft/class_5458 net/minecraft/util/registry/BuiltinRegistries 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_25931 PROCESSOR_LIST Lnet/minecraft/class_2378; - FIELD field_25932 TEMPLATE_POOL 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; FIELD field_25934 DEFAULT_VALUE_SUPPLIERS Ljava/util/Map; FIELD field_25935 ROOT Lnet/minecraft/class_2385; diff --git a/mappings/net/minecraft/world/biome/Biome.mapping b/mappings/net/minecraft/world/biome/Biome.mapping index e4ac6277f4..ee62c4f8a5 100644 --- a/mappings/net/minecraft/world/biome/Biome.mapping +++ b/mappings/net/minecraft/world/biome/Biome.mapping @@ -77,7 +77,7 @@ CLASS net/minecraft/class_1959 net/minecraft/world/biome/Biome METHOD method_8713 getWaterFogColor ()I METHOD method_8715 getDownfall ()F METHOD method_8724 hasHighHumidity ()Z - CLASS class_1960 Settings + CLASS class_1960 Builder FIELD field_22042 specialEffects Lnet/minecraft/class_4763; FIELD field_26396 temperatureModifier Lnet/minecraft/class_1959$class_5484; FIELD field_26636 spawnSettings Lnet/minecraft/class_5483; diff --git a/mappings/net/minecraft/world/biome/SpawnSettings.mapping b/mappings/net/minecraft/world/biome/SpawnSettings.mapping index b9988df900..df0f396714 100644 --- a/mappings/net/minecraft/world/biome/SpawnSettings.mapping +++ b/mappings/net/minecraft/world/biome/SpawnSettings.mapping @@ -49,10 +49,10 @@ CLASS net/minecraft/class_5483 net/minecraft/world/biome/SpawnSettings METHOD method_31007 build ()Lnet/minecraft/class_5483; METHOD method_31008 creatureSpawnProbability (F)Lnet/minecraft/class_5483$class_5496; ARG 1 probability - METHOD method_31009 spawnCosts (Lnet/minecraft/class_1299;DD)Lnet/minecraft/class_5483$class_5496; + METHOD method_31009 spawnCost (Lnet/minecraft/class_1299;DD)Lnet/minecraft/class_5483$class_5496; ARG 1 entityType ARG 2 mass ARG 4 gravityLimit - METHOD method_31011 spawners (Lnet/minecraft/class_1311;Lnet/minecraft/class_5483$class_1964;)Lnet/minecraft/class_5483$class_5496; + METHOD method_31011 spawn (Lnet/minecraft/class_1311;Lnet/minecraft/class_5483$class_1964;)Lnet/minecraft/class_5483$class_5496; ARG 1 spawnGroup ARG 2 spawnEntry diff --git a/mappings/net/minecraft/world/dimension/DimensionType.mapping b/mappings/net/minecraft/world/dimension/DimensionType.mapping index a9752209af..ff545a4b38 100644 --- a/mappings/net/minecraft/world/dimension/DimensionType.mapping +++ b/mappings/net/minecraft/world/dimension/DimensionType.mapping @@ -7,6 +7,7 @@ CLASS net/minecraft/class_2874 net/minecraft/world/dimension/DimensionType FIELD field_24753 OVERWORLD_REGISTRY_KEY Lnet/minecraft/class_5321; FIELD field_24754 THE_NETHER_REGISTRY_KEY Lnet/minecraft/class_5321; FIELD field_24755 THE_END_REGISTRY_KEY Lnet/minecraft/class_5321; + FIELD field_24756 REGISTRY_CODEC Lcom/mojang/serialization/Codec; FIELD field_24757 CODEC Lcom/mojang/serialization/Codec; FIELD field_24761 fixedTime Ljava/util/OptionalLong; FIELD field_24762 natural Z diff --git a/mappings/net/minecraft/world/gen/chunk/ChunkGeneratorSettings.mapping b/mappings/net/minecraft/world/gen/chunk/ChunkGeneratorSettings.mapping index ac6b958635..80c71dab91 100644 --- a/mappings/net/minecraft/world/gen/chunk/ChunkGeneratorSettings.mapping +++ b/mappings/net/minecraft/world/gen/chunk/ChunkGeneratorSettings.mapping @@ -2,6 +2,7 @@ CLASS net/minecraft/class_5284 net/minecraft/world/gen/chunk/ChunkGeneratorSetti FIELD field_24514 defaultBlock Lnet/minecraft/class_2680; FIELD field_24515 defaultFluid Lnet/minecraft/class_2680; FIELD field_24516 structuresConfig Lnet/minecraft/class_5311; + FIELD field_24780 CODEC Lcom/mojang/serialization/Codec; FIELD field_24781 REGISTRY_CODEC Lcom/mojang/serialization/Codec; FIELD field_24782 generationShapeConfig Lnet/minecraft/class_5309; FIELD field_24783 bedrockCeilingY I @@ -14,6 +15,7 @@ CLASS net/minecraft/class_5284 net/minecraft/world/gen/chunk/ChunkGeneratorSetti FIELD field_26358 END Lnet/minecraft/class_5321; FIELD field_26359 CAVES Lnet/minecraft/class_5321; FIELD field_26360 FLOATING_ISLANDS Lnet/minecraft/class_5321; + FIELD field_26707 INSTANCE Lnet/minecraft/class_5284; METHOD (Lnet/minecraft/class_5311;Lnet/minecraft/class_5309;Lnet/minecraft/class_2680;Lnet/minecraft/class_2680;IIIZ)V ARG 1 structuresConfig ARG 2 generationShapeConfig @@ -34,8 +36,28 @@ CLASS net/minecraft/class_5284 net/minecraft/world/gen/chunk/ChunkGeneratorSetti METHOD method_28005 getDefaultBlock ()Lnet/minecraft/class_2680; METHOD method_28006 getDefaultFluid ()Lnet/minecraft/class_2680; METHOD method_28007 getStructuresConfig ()Lnet/minecraft/class_5311; - METHOD method_28555 isIdEqual (Lnet/minecraft/class_5321;)Z + METHOD method_28555 equals (Lnet/minecraft/class_5321;)Z + ARG 1 registryKey METHOD method_28559 getGenerationShapeConfig ()Lnet/minecraft/class_5309; METHOD method_28561 getSeaLevel ()I METHOD method_28562 isMobGenerationDisabled ()Z + METHOD method_30641 createUndergroundSettings (Lnet/minecraft/class_5311;Lnet/minecraft/class_2680;Lnet/minecraft/class_2680;Lnet/minecraft/class_2960;)Lnet/minecraft/class_5284; + ARG 0 structuresConfig + ARG 1 defaultBlock + ARG 2 defaultFluid + ARG 3 id + METHOD method_30642 createIslandSettings (Lnet/minecraft/class_5311;Lnet/minecraft/class_2680;Lnet/minecraft/class_2680;Lnet/minecraft/class_2960;ZZ)Lnet/minecraft/class_5284; + ARG 0 structuresConfig + ARG 1 defaultBlock + ARG 2 defaultFluid + ARG 3 id + ARG 4 mobGenerationDisabled + ARG 5 islandNoiseOverride + METHOD method_30643 createSurfaceSettings (Lnet/minecraft/class_5311;ZLnet/minecraft/class_2960;)Lnet/minecraft/class_5284; + ARG 0 structuresConfig + ARG 1 amplified + ARG 2 id METHOD method_30644 register (Lnet/minecraft/class_5321;Lnet/minecraft/class_5284;)Lnet/minecraft/class_5284; + ARG 0 registryKey + ARG 1 settings + METHOD method_31111 getInstance ()Lnet/minecraft/class_5284;