From 4c75a2df53d3b25b6baa2b0eb1df20fbd6b973da Mon Sep 17 00:00:00 2001 From: YanisBft Date: Sun, 30 Aug 2020 12:07:55 +0200 Subject: [PATCH] Random worldgen (#1728) --- mappings/net/minecraft/entity/SpawnGroup.mapping | 5 +++++ mappings/net/minecraft/entity/ai/brain/Memory.mapping | 5 +++++ .../net/minecraft/entity/ai/brain/MemoryModuleType.mapping | 3 ++- mappings/net/minecraft/util/math/ChunkPos.mapping | 2 +- mappings/net/minecraft/world/Heightmap.mapping | 1 + mappings/net/minecraft/world/gen/CatSpawner.mapping | 2 ++ mappings/net/minecraft/world/gen/GenerationStep.mapping | 3 +++ .../net/minecraft/world/gen/carver/ConfiguredCarver.mapping | 4 ++++ .../minecraft/world/gen/chunk/NoiseChunkGenerator.mapping | 3 +++ .../world/gen/decorator/DepthAverageDecoratorConfig.mapping | 6 +++--- .../minecraft/world/gen/feature/MineshaftFeature.mapping | 5 +++-- .../minecraft/world/gen/feature/OceanRuinFeature.mapping | 3 ++- .../minecraft/world/gen/feature/OreFeatureConfig.mapping | 1 + .../minecraft/world/gen/feature/RuinedPortalFeature.mapping | 1 + .../minecraft/world/gen/feature/size/FeatureSize.mapping | 2 +- .../gen/surfacebuilder/ConfiguredSurfaceBuilder.mapping | 3 +++ .../world/gen/surfacebuilder/SurfaceBuilder.mapping | 6 ++++++ 17 files changed, 46 insertions(+), 9 deletions(-) diff --git a/mappings/net/minecraft/entity/SpawnGroup.mapping b/mappings/net/minecraft/entity/SpawnGroup.mapping index 39b4a1bc5f..068d64ef4a 100644 --- a/mappings/net/minecraft/entity/SpawnGroup.mapping +++ b/mappings/net/minecraft/entity/SpawnGroup.mapping @@ -1,6 +1,7 @@ CLASS net/minecraft/class_1311 net/minecraft/entity/SpawnGroup FIELD field_24461 despawnStartRange I FIELD field_24462 immediateDespawnRange I + FIELD field_24655 CODEC Lcom/mojang/serialization/Codec; FIELD field_6295 animal Z FIELD field_6296 BY_NAME Ljava/util/Map; FIELD field_6297 capacity I @@ -12,7 +13,11 @@ CLASS net/minecraft/class_1311 net/minecraft/entity/SpawnGroup ARG 5 peaceful METHOD method_27919 getImmediateDespawnRange ()I METHOD method_27920 getDespawnStartRange ()I + METHOD method_28307 byName (Ljava/lang/String;)Lnet/minecraft/class_1311; + ARG 0 name METHOD method_6133 getName ()Ljava/lang/String; METHOD method_6134 getCapacity ()I METHOD method_6135 isAnimal ()Z METHOD method_6136 isPeaceful ()Z + METHOD method_6137 (Lnet/minecraft/class_1311;)Lnet/minecraft/class_1311; + ARG 0 spawnGroup diff --git a/mappings/net/minecraft/entity/ai/brain/Memory.mapping b/mappings/net/minecraft/entity/ai/brain/Memory.mapping index b84554375a..875a0d0e0b 100644 --- a/mappings/net/minecraft/entity/ai/brain/Memory.mapping +++ b/mappings/net/minecraft/entity/ai/brain/Memory.mapping @@ -1,6 +1,9 @@ CLASS net/minecraft/class_4831 net/minecraft/entity/ai/brain/Memory FIELD field_22330 value Ljava/lang/Object; FIELD field_22331 expiry J + METHOD (Ljava/lang/Object;J)V + ARG 1 value + ARG 2 expiry METHOD method_24634 isExpired ()Z METHOD method_24636 timed (Ljava/lang/Object;J)Lnet/minecraft/class_4831; COMMENT Creates a memory that has an expiry time. @@ -8,3 +11,5 @@ CLASS net/minecraft/class_4831 net/minecraft/entity/ai/brain/Memory ARG 1 expiry METHOD method_24637 getValue ()Ljava/lang/Object; METHOD method_24913 tick ()V + METHOD method_28353 createCodec (Lcom/mojang/serialization/Codec;)Lcom/mojang/serialization/Codec; + ARG 0 codec diff --git a/mappings/net/minecraft/entity/ai/brain/MemoryModuleType.mapping b/mappings/net/minecraft/entity/ai/brain/MemoryModuleType.mapping index 7e52265c98..5e9502a2fd 100644 --- a/mappings/net/minecraft/entity/ai/brain/MemoryModuleType.mapping +++ b/mappings/net/minecraft/entity/ai/brain/MemoryModuleType.mapping @@ -1,9 +1,10 @@ CLASS net/minecraft/class_4140 net/minecraft/entity/ai/brain/MemoryModuleType FIELD field_24668 codec Ljava/util/Optional; METHOD (Ljava/util/Optional;)V - ARG 1 factory + ARG 1 codec METHOD method_19092 register (Ljava/lang/String;Lcom/mojang/serialization/Codec;)Lnet/minecraft/class_4140; ARG 0 id + ARG 1 codec METHOD method_19093 getCodec ()Ljava/util/Optional; METHOD method_20738 register (Ljava/lang/String;)Lnet/minecraft/class_4140; ARG 0 id diff --git a/mappings/net/minecraft/util/math/ChunkPos.mapping b/mappings/net/minecraft/util/math/ChunkPos.mapping index f2893b6f33..0bcbdbe25b 100644 --- a/mappings/net/minecraft/util/math/ChunkPos.mapping +++ b/mappings/net/minecraft/util/math/ChunkPos.mapping @@ -21,7 +21,7 @@ CLASS net/minecraft/class_1923 net/minecraft/util/math/ChunkPos METHOD method_19281 stream (Lnet/minecraft/class_1923;Lnet/minecraft/class_1923;)Ljava/util/stream/Stream; ARG 0 pos1 ARG 1 pos2 - METHOD method_8323 getCenterBlockPos ()Lnet/minecraft/class_2338; + METHOD method_8323 getStartPos ()Lnet/minecraft/class_2338; METHOD method_8324 toLong ()J METHOD method_8325 getPackedX (J)I ARG 0 pos diff --git a/mappings/net/minecraft/world/Heightmap.mapping b/mappings/net/minecraft/world/Heightmap.mapping index 13b3b3e9fa..0c9a99f590 100644 --- a/mappings/net/minecraft/world/Heightmap.mapping +++ b/mappings/net/minecraft/world/Heightmap.mapping @@ -33,6 +33,7 @@ CLASS net/minecraft/class_2902 net/minecraft/world/Heightmap FIELD field_13204 name Ljava/lang/String; FIELD field_13205 BY_NAME Ljava/util/Map; FIELD field_16568 blockPredicate Ljava/util/function/Predicate; + FIELD field_24772 CODEC Lcom/mojang/serialization/Codec; METHOD (Ljava/lang/String;ILjava/lang/String;Lnet/minecraft/class_2902$class_2904;Ljava/util/function/Predicate;)V ARG 3 name ARG 4 purpose diff --git a/mappings/net/minecraft/world/gen/CatSpawner.mapping b/mappings/net/minecraft/world/gen/CatSpawner.mapping index b96717c9ea..ea48bace19 100644 --- a/mappings/net/minecraft/world/gen/CatSpawner.mapping +++ b/mappings/net/minecraft/world/gen/CatSpawner.mapping @@ -1,9 +1,11 @@ CLASS net/minecraft/class_4274 net/minecraft/world/gen/CatSpawner FIELD field_19171 ticksUntilNextSpawn I METHOD method_20260 spawnInSwampHut (Lnet/minecraft/class_3218;Lnet/minecraft/class_2338;)I + ARG 1 world ARG 2 pos METHOD method_20262 spawn (Lnet/minecraft/class_2338;Lnet/minecraft/class_3218;)I ARG 1 pos + ARG 2 world METHOD method_20263 spawnInHouse (Lnet/minecraft/class_3218;Lnet/minecraft/class_2338;)I ARG 1 world ARG 2 pos diff --git a/mappings/net/minecraft/world/gen/GenerationStep.mapping b/mappings/net/minecraft/world/gen/GenerationStep.mapping index ab0d1aa229..ae1be2e99e 100644 --- a/mappings/net/minecraft/world/gen/GenerationStep.mapping +++ b/mappings/net/minecraft/world/gen/GenerationStep.mapping @@ -2,7 +2,10 @@ CLASS net/minecraft/class_2893 net/minecraft/world/gen/GenerationStep CLASS class_2894 Carver FIELD field_13167 name Ljava/lang/String; FIELD field_13168 BY_NAME Ljava/util/Map; + FIELD field_24770 CODEC Lcom/mojang/serialization/Codec; METHOD (Ljava/lang/String;ILjava/lang/String;)V ARG 3 name METHOD method_12581 getName ()Ljava/lang/String; + METHOD method_28546 byName (Ljava/lang/String;)Lnet/minecraft/class_2893$class_2894; + ARG 0 name CLASS class_2895 Feature diff --git a/mappings/net/minecraft/world/gen/carver/ConfiguredCarver.mapping b/mappings/net/minecraft/world/gen/carver/ConfiguredCarver.mapping index 325ef3427a..7ca3baa52d 100644 --- a/mappings/net/minecraft/world/gen/carver/ConfiguredCarver.mapping +++ b/mappings/net/minecraft/world/gen/carver/ConfiguredCarver.mapping @@ -1,10 +1,14 @@ CLASS net/minecraft/class_2922 net/minecraft/world/gen/carver/ConfiguredCarver FIELD field_13278 config Lnet/minecraft/class_2920; FIELD field_13279 carver Lnet/minecraft/class_2939; + FIELD field_24828 REGISTRY_CODEC Lcom/mojang/serialization/Codec; + FIELD field_25832 CODEC Lcom/mojang/serialization/Codec; METHOD (Lnet/minecraft/class_2939;Lnet/minecraft/class_2920;)V ARG 1 carver ARG 2 config METHOD method_12668 carve (Lnet/minecraft/class_2791;Ljava/util/function/Function;Ljava/util/Random;IIIIILjava/util/BitSet;)Z METHOD method_12669 shouldCarve (Ljava/util/Random;II)Z + ARG 1 random ARG 2 chunkX ARG 3 chunkZ + METHOD method_30378 getConfig ()Lnet/minecraft/class_2920; diff --git a/mappings/net/minecraft/world/gen/chunk/NoiseChunkGenerator.mapping b/mappings/net/minecraft/world/gen/chunk/NoiseChunkGenerator.mapping index fb0b0ca7cc..d34e73e074 100644 --- a/mappings/net/minecraft/world/gen/chunk/NoiseChunkGenerator.mapping +++ b/mappings/net/minecraft/world/gen/chunk/NoiseChunkGenerator.mapping @@ -20,6 +20,9 @@ CLASS net/minecraft/class_3754 net/minecraft/world/gen/chunk/NoiseChunkGenerator FIELD field_24777 islandNoise Lnet/minecraft/class_3541; FIELD field_24778 worldSeed J FIELD field_24779 worldHeight I + METHOD (Lnet/minecraft/class_1966;JLjava/util/function/Supplier;)V + ARG 1 biomeSource + ARG 2 worldSeed METHOD (Lnet/minecraft/class_1966;Lnet/minecraft/class_1966;JLjava/util/function/Supplier;)V ARG 3 worldSeed METHOD method_16405 sampleNoiseColumn ([DII)V diff --git a/mappings/net/minecraft/world/gen/decorator/DepthAverageDecoratorConfig.mapping b/mappings/net/minecraft/world/gen/decorator/DepthAverageDecoratorConfig.mapping index 9acddf794a..673bdc7276 100644 --- a/mappings/net/minecraft/world/gen/decorator/DepthAverageDecoratorConfig.mapping +++ b/mappings/net/minecraft/world/gen/decorator/DepthAverageDecoratorConfig.mapping @@ -1,7 +1,7 @@ CLASS net/minecraft/class_3277 net/minecraft/world/gen/decorator/DepthAverageDecoratorConfig FIELD field_14212 spread I - FIELD field_14214 count I + FIELD field_14214 baseline I FIELD field_24982 CODEC Lcom/mojang/serialization/Codec; METHOD (II)V - ARG 1 count - ARG 2 baseline + ARG 1 baseline + ARG 2 spread diff --git a/mappings/net/minecraft/world/gen/feature/MineshaftFeature.mapping b/mappings/net/minecraft/world/gen/feature/MineshaftFeature.mapping index 68fe89717d..a0c6e8faca 100644 --- a/mappings/net/minecraft/world/gen/feature/MineshaftFeature.mapping +++ b/mappings/net/minecraft/world/gen/feature/MineshaftFeature.mapping @@ -2,9 +2,10 @@ CLASS net/minecraft/class_3098 net/minecraft/world/gen/feature/MineshaftFeature CLASS class_3099 Start CLASS class_3100 Type FIELD field_13689 name Ljava/lang/String; - FIELD field_13690 nameMap Ljava/util/Map; + FIELD field_13690 BY_NAME Ljava/util/Map; + FIELD field_24839 CODEC Lcom/mojang/serialization/Codec; METHOD method_13532 byName (Ljava/lang/String;)Lnet/minecraft/class_3098$class_3100; - ARG 0 nam + ARG 0 name METHOD method_13534 getName ()Ljava/lang/String; METHOD method_13535 byIndex (I)Lnet/minecraft/class_3098$class_3100; ARG 0 index diff --git a/mappings/net/minecraft/world/gen/feature/OceanRuinFeature.mapping b/mappings/net/minecraft/world/gen/feature/OceanRuinFeature.mapping index 7701d57a58..efa775a778 100644 --- a/mappings/net/minecraft/world/gen/feature/OceanRuinFeature.mapping +++ b/mappings/net/minecraft/world/gen/feature/OceanRuinFeature.mapping @@ -2,7 +2,8 @@ CLASS net/minecraft/class_3411 net/minecraft/world/gen/feature/OceanRuinFeature CLASS class_3412 Start CLASS class_3413 BiomeType FIELD field_14529 name Ljava/lang/String; - FIELD field_14530 nameMap Ljava/util/Map; + FIELD field_14530 BY_NAME Ljava/util/Map; + FIELD field_24990 CODEC Lcom/mojang/serialization/Codec; METHOD method_14830 byName (Ljava/lang/String;)Lnet/minecraft/class_3411$class_3413; ARG 0 name METHOD method_14831 getName ()Ljava/lang/String; diff --git a/mappings/net/minecraft/world/gen/feature/OreFeatureConfig.mapping b/mappings/net/minecraft/world/gen/feature/OreFeatureConfig.mapping index e7e2ff304c..b2945bcf22 100644 --- a/mappings/net/minecraft/world/gen/feature/OreFeatureConfig.mapping +++ b/mappings/net/minecraft/world/gen/feature/OreFeatureConfig.mapping @@ -4,6 +4,7 @@ CLASS net/minecraft/class_3124 net/minecraft/world/gen/feature/OreFeatureConfig FIELD field_13725 target Lnet/minecraft/class_3825; FIELD field_24896 CODEC Lcom/mojang/serialization/Codec; METHOD (Lnet/minecraft/class_3825;Lnet/minecraft/class_2680;I)V + ARG 1 target ARG 2 state ARG 3 size CLASS class_5436 Rules diff --git a/mappings/net/minecraft/world/gen/feature/RuinedPortalFeature.mapping b/mappings/net/minecraft/world/gen/feature/RuinedPortalFeature.mapping index 13badd20f8..3d4676e886 100644 --- a/mappings/net/minecraft/world/gen/feature/RuinedPortalFeature.mapping +++ b/mappings/net/minecraft/world/gen/feature/RuinedPortalFeature.mapping @@ -16,6 +16,7 @@ CLASS net/minecraft/class_5183 net/minecraft/world/gen/feature/RuinedPortalFeatu CLASS class_5185 Type FIELD field_24007 BY_NAME Ljava/util/Map; FIELD field_24008 name Ljava/lang/String; + FIELD field_24840 CODEC Lcom/mojang/serialization/Codec; METHOD (Ljava/lang/String;ILjava/lang/String;)V ARG 3 name METHOD method_27214 getName ()Ljava/lang/String; diff --git a/mappings/net/minecraft/world/gen/feature/size/FeatureSize.mapping b/mappings/net/minecraft/world/gen/feature/size/FeatureSize.mapping index 7ae6e0b256..18fc572edd 100644 --- a/mappings/net/minecraft/world/gen/feature/size/FeatureSize.mapping +++ b/mappings/net/minecraft/world/gen/feature/size/FeatureSize.mapping @@ -1,6 +1,6 @@ CLASS net/minecraft/class_5201 net/minecraft/world/gen/feature/size/FeatureSize FIELD field_24146 minClippedHeight Ljava/util/OptionalInt; - FIELD field_24922 CODEC Lcom/mojang/serialization/Codec; + FIELD field_24922 TYPE_CODEC Lcom/mojang/serialization/Codec; METHOD (Ljava/util/OptionalInt;)V ARG 1 minClippedHeight METHOD method_27377 getMinClippedHeight ()Ljava/util/OptionalInt; diff --git a/mappings/net/minecraft/world/gen/surfacebuilder/ConfiguredSurfaceBuilder.mapping b/mappings/net/minecraft/world/gen/surfacebuilder/ConfiguredSurfaceBuilder.mapping index 3a07d08d8a..738b0b4f97 100644 --- a/mappings/net/minecraft/world/gen/surfacebuilder/ConfiguredSurfaceBuilder.mapping +++ b/mappings/net/minecraft/world/gen/surfacebuilder/ConfiguredSurfaceBuilder.mapping @@ -1,8 +1,11 @@ CLASS net/minecraft/class_3504 net/minecraft/world/gen/surfacebuilder/ConfiguredSurfaceBuilder FIELD field_15610 surfaceBuilder Lnet/minecraft/class_3523; FIELD field_15611 config Lnet/minecraft/class_3531; + FIELD field_25015 REGISTRY_CODEC Lcom/mojang/serialization/Codec; + FIELD field_25878 CODEC Lcom/mojang/serialization/Codec; METHOD (Lnet/minecraft/class_3523;Lnet/minecraft/class_3531;)V ARG 1 surfaceBuilder + ARG 2 config METHOD method_15197 getConfig ()Lnet/minecraft/class_3531; METHOD method_15198 generate (Ljava/util/Random;Lnet/minecraft/class_2791;Lnet/minecraft/class_1959;IIIDLnet/minecraft/class_2680;Lnet/minecraft/class_2680;IJ)V ARG 1 random diff --git a/mappings/net/minecraft/world/gen/surfacebuilder/SurfaceBuilder.mapping b/mappings/net/minecraft/world/gen/surfacebuilder/SurfaceBuilder.mapping index c609138479..d15b704224 100644 --- a/mappings/net/minecraft/world/gen/surfacebuilder/SurfaceBuilder.mapping +++ b/mappings/net/minecraft/world/gen/surfacebuilder/SurfaceBuilder.mapping @@ -35,6 +35,9 @@ CLASS net/minecraft/class_3523 net/minecraft/world/gen/surfacebuilder/SurfaceBui FIELD field_23927 BLACKSTONE Lnet/minecraft/class_2680; FIELD field_23928 BASALT Lnet/minecraft/class_2680; FIELD field_23929 MAGMA_BLOCK Lnet/minecraft/class_2680; + FIELD field_25016 codec Lcom/mojang/serialization/Codec; + METHOD (Lcom/mojang/serialization/Codec;)V + ARG 1 codec METHOD method_15305 generate (Ljava/util/Random;Lnet/minecraft/class_2791;Lnet/minecraft/class_1959;IIIDLnet/minecraft/class_2680;Lnet/minecraft/class_2680;IJLnet/minecraft/class_3531;)V ARG 1 random ARG 2 chunk @@ -51,3 +54,6 @@ CLASS net/minecraft/class_3523 net/minecraft/world/gen/surfacebuilder/SurfaceBui METHOD method_15306 initSeed (J)V ARG 1 seed METHOD method_15307 register (Ljava/lang/String;Lnet/minecraft/class_3523;)Lnet/minecraft/class_3523; + ARG 0 id + ARG 1 surfaceBuilder + METHOD method_29003 getCodec ()Lcom/mojang/serialization/Codec;