From 5e5c59dbe5d82e0ea64b94ca4f4d1f692bcb0a5b Mon Sep 17 00:00:00 2001 From: Yanis48 Date: Thu, 30 Jul 2020 12:16:34 +0200 Subject: [PATCH] Biomes strike again (#1632) --- .../net/minecraft/world/biome/Biome.mapping | 19 +++++++++ .../world/biome/GenerationSettings.mapping | 41 ++++++++++++++++++- .../world/biome/SpawnSettings.mapping | 21 ++++++++++ 3 files changed, 79 insertions(+), 2 deletions(-) diff --git a/mappings/net/minecraft/world/biome/Biome.mapping b/mappings/net/minecraft/world/biome/Biome.mapping index 87a3facaf6..5bdd7cc9db 100644 --- a/mappings/net/minecraft/world/biome/Biome.mapping +++ b/mappings/net/minecraft/world/biome/Biome.mapping @@ -5,6 +5,7 @@ CLASS net/minecraft/class_1959 net/minecraft/world/biome/Biome FIELD field_25819 CODEC Lcom/mojang/serialization/Codec; FIELD field_26393 weather Lnet/minecraft/class_1959$class_5482; FIELD field_26395 spawnSettings Lnet/minecraft/class_5483; + FIELD field_26635 generationSettings Lnet/minecraft/class_5485; FIELD field_9323 BIOMES Ljava/util/Set; FIELD field_9324 FOLIAGE_NOISE Lnet/minecraft/class_3543; FIELD field_9329 category Lnet/minecraft/class_1959$class_1961; @@ -13,6 +14,15 @@ CLASS net/minecraft/class_1959 net/minecraft/world/biome/Biome FIELD field_9335 TEMPERATURE_NOISE Lnet/minecraft/class_3543; FIELD field_9341 scale F FIELD field_9343 depth F + METHOD (Lnet/minecraft/class_1959$class_5482;Lnet/minecraft/class_1959$class_1961;FFLnet/minecraft/class_4763;Lnet/minecraft/class_5485;Lnet/minecraft/class_5483;Ljava/util/Optional;)V + ARG 1 weather + ARG 2 category + ARG 3 depth + ARG 4 scale + ARG 5 effects + ARG 6 generationSettings + ARG 7 spawnSettings + ARG 8 parent METHOD method_21740 getTemperature (Lnet/minecraft/class_2338;)F ARG 1 blockPos METHOD method_24376 getFogColor ()I @@ -24,6 +34,8 @@ CLASS net/minecraft/class_1959 net/minecraft/world/biome/Biome METHOD method_27343 getMusic ()Ljava/util/Optional; METHOD method_30773 getDefaultGrassColor ()I METHOD method_30774 getDefaultFoliageColor ()I + METHOD method_30966 getSpawnSettings ()Lnet/minecraft/class_5483; + METHOD method_30970 getGenerationSettings ()Lnet/minecraft/class_5485; METHOD method_8685 canSetIce (Lnet/minecraft/class_4538;Lnet/minecraft/class_2338;Z)Z ARG 1 world ARG 2 pos @@ -74,6 +86,8 @@ CLASS net/minecraft/class_1959 net/minecraft/world/biome/Biome CLASS class_1960 Settings 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; + FIELD field_26637 generationSettings Lnet/minecraft/class_5485; FIELD field_9344 depth Ljava/lang/Float; FIELD field_9345 category Lnet/minecraft/class_1959$class_1961; FIELD field_9346 precipitation Lnet/minecraft/class_1959$class_1963; @@ -85,6 +99,11 @@ CLASS net/minecraft/class_1959 net/minecraft/world/biome/Biome ARG 1 effects METHOD method_30777 temperatureModifier (Lnet/minecraft/class_1959$class_5484;)Lnet/minecraft/class_1959$class_1960; ARG 1 temperatureModifier + METHOD method_30972 build ()Lnet/minecraft/class_1959; + METHOD method_30973 generationSettings (Lnet/minecraft/class_5485;)Lnet/minecraft/class_1959$class_1960; + ARG 1 generationSettings + METHOD method_30974 spawnSettings (Lnet/minecraft/class_5483;)Lnet/minecraft/class_1959$class_1960; + ARG 1 spawnSettings METHOD method_8727 downfall (F)Lnet/minecraft/class_1959$class_1960; ARG 1 downfall METHOD method_8735 precipitation (Lnet/minecraft/class_1959$class_1963;)Lnet/minecraft/class_1959$class_1960; diff --git a/mappings/net/minecraft/world/biome/GenerationSettings.mapping b/mappings/net/minecraft/world/biome/GenerationSettings.mapping index 14ebcba192..0c9b20bef3 100644 --- a/mappings/net/minecraft/world/biome/GenerationSettings.mapping +++ b/mappings/net/minecraft/world/biome/GenerationSettings.mapping @@ -3,9 +3,46 @@ CLASS net/minecraft/class_5485 net/minecraft/world/biome/GenerationSettings FIELD field_26414 surfaceBuilder Ljava/util/function/Supplier; FIELD field_26415 carvers Ljava/util/Map; FIELD field_26416 features Ljava/util/List; - FIELD field_26417 starts Ljava/util/List; + FIELD field_26417 structureFeatures Ljava/util/List; + FIELD field_26638 LOGGER Lorg/apache/logging/log4j/Logger; + FIELD field_26639 INSTANCE Lnet/minecraft/class_5485; + FIELD field_26640 flowerFeatures Ljava/util/List; METHOD (Ljava/util/function/Supplier;Ljava/util/Map;Ljava/util/List;Ljava/util/List;)V ARG 1 surfaceBuilder ARG 2 carvers ARG 3 features - ARG 4 starts + ARG 4 structureFeatures + METHOD method_30975 getStructureFeatures ()Ljava/util/Collection; + METHOD method_30976 getCarversForStep (Lnet/minecraft/class_2893$class_2894;)Ljava/util/List; + ARG 1 carverStep + METHOD method_30980 hasStructureFeature (Lnet/minecraft/class_3195;)Z + ARG 1 structureFeature + METHOD method_30982 getFlowerFeatures ()Ljava/util/List; + METHOD method_30983 getFeatures ()Ljava/util/List; + COMMENT Returns the lists of features configured for each {@link net.minecraft.world.gen.GenerationStep.Feature feature generation step}, up to the highest step that has a configured feature. + COMMENT Entries are guaranteed to not be null, but may be empty lists if an earlier step has no features, but a later step does. + METHOD method_30984 getSurfaceBuilder ()Ljava/util/function/Supplier; + METHOD method_30985 getSurfaceConfig ()Lnet/minecraft/class_3531; + CLASS class_5495 Builder + FIELD field_26641 surfaceBuilder Ljava/util/Optional; + FIELD field_26642 carvers Ljava/util/Map; + FIELD field_26643 features Ljava/util/List; + FIELD field_26644 structureFeatures Ljava/util/List; + METHOD method_30987 build ()Lnet/minecraft/class_5485; + METHOD method_30988 addFeatureStep (I)V + ARG 1 stepIndex + METHOD method_30989 feature (ILjava/util/function/Supplier;)Lnet/minecraft/class_5485$class_5495; + ARG 1 stepIndex + ARG 2 featureSupplier + METHOD method_30991 carver (Lnet/minecraft/class_2893$class_2894;Lnet/minecraft/class_2922;)Lnet/minecraft/class_5485$class_5495; + ARG 1 carverStep + ARG 2 carver + METHOD method_30992 feature (Lnet/minecraft/class_2893$class_2895;Lnet/minecraft/class_2975;)Lnet/minecraft/class_5485$class_5495; + ARG 1 featureStep + ARG 2 feature + METHOD method_30995 structureFeature (Lnet/minecraft/class_5312;)Lnet/minecraft/class_5485$class_5495; + ARG 1 structureFeature + METHOD method_30996 surfaceBuilder (Lnet/minecraft/class_3504;)Lnet/minecraft/class_5485$class_5495; + ARG 1 surfaceBuilder + METHOD method_30998 surfaceBuilder (Ljava/util/function/Supplier;)Lnet/minecraft/class_5485$class_5495; + ARG 1 surfaceBuilderSupplier diff --git a/mappings/net/minecraft/world/biome/SpawnSettings.mapping b/mappings/net/minecraft/world/biome/SpawnSettings.mapping index 8c648035dc..7690a3d6ff 100644 --- a/mappings/net/minecraft/world/biome/SpawnSettings.mapping +++ b/mappings/net/minecraft/world/biome/SpawnSettings.mapping @@ -3,10 +3,17 @@ CLASS net/minecraft/class_5483 net/minecraft/world/biome/SpawnSettings FIELD field_26404 creatureSpawnProbability F FIELD field_26405 spawners Ljava/util/Map; FIELD field_26406 spawnCosts Ljava/util/Map; + FIELD field_26645 LOGGER Lorg/apache/logging/log4j/Logger; + FIELD field_26646 INSTANCE Lnet/minecraft/class_5483; METHOD (FLjava/util/Map;Ljava/util/Map;)V ARG 1 creatureSpawnProbability ARG 2 spawners ARG 3 spawnCosts + METHOD method_31002 getCreatureSpawnProbability ()F + METHOD method_31003 getSpawnDensity (Lnet/minecraft/class_1299;)Lnet/minecraft/class_5483$class_5265; + ARG 1 entityType + METHOD method_31004 getSpawnEntry (Lnet/minecraft/class_1311;)Ljava/util/List; + ARG 1 spawnGroup CLASS class_1964 SpawnEntry FIELD field_24681 CODEC Lcom/mojang/serialization/Codec; FIELD field_9387 maxGroupSize I @@ -35,3 +42,17 @@ CLASS net/minecraft/class_5483 net/minecraft/world/biome/SpawnSettings METHOD method_27838 getMass ()D COMMENT Represents the mass of each entity spawned. Will affect gravity COMMENT calculation. + CLASS class_5496 Builder + FIELD field_26647 spawners Ljava/util/Map; + FIELD field_26648 spawnCosts Ljava/util/Map; + FIELD field_26649 creatureSpawnProbability F + 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; + 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; + ARG 1 spawnGroup + ARG 2 spawnEntry