From 339a846b43a95801e710353a0130dcc2f9752519 Mon Sep 17 00:00:00 2001 From: YanisBft Date: Sun, 11 Apr 2021 14:08:51 +0200 Subject: [PATCH] Some world-related methods and constants (#2313) --- gradle.properties | 2 +- .../net/minecraft/structure/JigsawJunction.mapping | 2 ++ .../minecraft/structure/MineshaftGenerator.mapping | 1 + mappings/net/minecraft/structure/Structure.mapping | 11 +++++++++++ .../net/minecraft/structure/SwampHutGenerator.mapping | 1 + .../world/gen/chunk/ChunkGeneratorSettings.mapping | 7 +++++++ .../world/gen/feature/BastionRemnantFeature.mapping | 1 + .../net/minecraft/world/level/LevelProperties.mapping | 1 + 8 files changed, 25 insertions(+), 1 deletion(-) diff --git a/gradle.properties b/gradle.properties index 3b3406568f..3e00d40f00 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,7 +1,7 @@ # Done to increase the memory available to gradle. org.gradle.jvmargs=-Xmx1G -enigma_version=0.27.0 +enigma_version=0.27.1 stitch_version=0.5.1+build.77 unpick_version=2.2.0 # Loader is only used by javadoc generation/linking diff --git a/mappings/net/minecraft/structure/JigsawJunction.mapping b/mappings/net/minecraft/structure/JigsawJunction.mapping index 796593df96..b5be2f2263 100644 --- a/mappings/net/minecraft/structure/JigsawJunction.mapping +++ b/mappings/net/minecraft/structure/JigsawJunction.mapping @@ -16,3 +16,5 @@ CLASS net/minecraft/class_3780 net/minecraft/structure/JigsawJunction METHOD method_16610 getSourceX ()I METHOD method_16611 getSourceGroundY ()I METHOD method_16612 serialize (Lcom/mojang/serialization/DynamicOps;)Lcom/mojang/serialization/Dynamic; + METHOD method_35367 getDeltaY ()I + METHOD method_35368 getDestProjection ()Lnet/minecraft/class_3785$class_3786; diff --git a/mappings/net/minecraft/structure/MineshaftGenerator.mapping b/mappings/net/minecraft/structure/MineshaftGenerator.mapping index 7fd8506598..8d4dfb3265 100644 --- a/mappings/net/minecraft/structure/MineshaftGenerator.mapping +++ b/mappings/net/minecraft/structure/MineshaftGenerator.mapping @@ -1,4 +1,5 @@ CLASS net/minecraft/class_3353 net/minecraft/structure/MineshaftGenerator + FIELD field_29326 LOGGER Lorg/apache/logging/log4j/Logger; METHOD method_14711 pieceGenerator (Lnet/minecraft/class_3443;Lnet/minecraft/class_6130;Ljava/util/Random;IIILnet/minecraft/class_2350;I)Lnet/minecraft/class_3353$class_3356; ARG 0 start ARG 2 random diff --git a/mappings/net/minecraft/structure/Structure.mapping b/mappings/net/minecraft/structure/Structure.mapping index a30dc3625f..60beb1f128 100644 --- a/mappings/net/minecraft/structure/Structure.mapping +++ b/mappings/net/minecraft/structure/Structure.mapping @@ -3,6 +3,17 @@ CLASS net/minecraft/class_3499 net/minecraft/structure/Structure FIELD field_15587 size Lnet/minecraft/class_2382; FIELD field_15588 author Ljava/lang/String; FIELD field_15589 entities Ljava/util/List; + FIELD field_31687 PALETTE_KEY Ljava/lang/String; + FIELD field_31688 PALETTES_KEY Ljava/lang/String; + FIELD field_31689 ENTITIES_KEY Ljava/lang/String; + FIELD field_31690 BLOCKS_KEY Ljava/lang/String; + FIELD field_31691 BLOCKS_POS_KEY Ljava/lang/String; + FIELD field_31692 BLOCKS_STATE_KEY Ljava/lang/String; + FIELD field_31693 BLOCKS_NBT_KEY Ljava/lang/String; + FIELD field_31694 ENTITIES_POS_KEY Ljava/lang/String; + FIELD field_31695 ENTITIES_BLOCK_POS_KEY Ljava/lang/String; + FIELD field_31696 ENTITIES_NBT_KEY Ljava/lang/String; + FIELD field_31697 SIZE_KEY Ljava/lang/String; METHOD method_15160 getSize ()Lnet/minecraft/class_2382; METHOD method_15161 setAuthor (Ljava/lang/String;)V ARG 1 name diff --git a/mappings/net/minecraft/structure/SwampHutGenerator.mapping b/mappings/net/minecraft/structure/SwampHutGenerator.mapping index 352cc184f7..2b3aa555e6 100644 --- a/mappings/net/minecraft/structure/SwampHutGenerator.mapping +++ b/mappings/net/minecraft/structure/SwampHutGenerator.mapping @@ -4,6 +4,7 @@ CLASS net/minecraft/class_3447 net/minecraft/structure/SwampHutGenerator METHOD (Ljava/util/Random;II)V ARG 1 random METHOD (Lnet/minecraft/class_3218;Lnet/minecraft/class_2487;)V + ARG 1 world ARG 2 nbt METHOD method_16181 spawnCat (Lnet/minecraft/class_5425;Lnet/minecraft/class_3341;)V ARG 1 world diff --git a/mappings/net/minecraft/world/gen/chunk/ChunkGeneratorSettings.mapping b/mappings/net/minecraft/world/gen/chunk/ChunkGeneratorSettings.mapping index 66c0231101..9d1e9601e1 100644 --- a/mappings/net/minecraft/world/gen/chunk/ChunkGeneratorSettings.mapping +++ b/mappings/net/minecraft/world/gen/chunk/ChunkGeneratorSettings.mapping @@ -19,6 +19,7 @@ CLASS net/minecraft/class_5284 net/minecraft/world/gen/chunk/ChunkGeneratorSetti FIELD field_28846 aquifers Z FIELD field_28847 noiseCaves Z FIELD field_28914 deepslate Z + FIELD field_33412 minSurfaceLevel I METHOD (Lnet/minecraft/class_5311;Lnet/minecraft/class_5309;Lnet/minecraft/class_2680;Lnet/minecraft/class_2680;IIIIZZZZ)V ARG 1 structuresConfig ARG 2 generationShapeConfig @@ -27,6 +28,11 @@ CLASS net/minecraft/class_5284 net/minecraft/world/gen/chunk/ChunkGeneratorSetti ARG 5 bedrockCeilingY ARG 6 bedrockFloorY ARG 7 seaLevel + ARG 8 minSurfaceLevel + ARG 9 mobGenerationDisabled + ARG 10 aquifers + ARG 11 noiseCaves + ARG 12 deepslate METHOD method_16400 getBedrockCeilingY ()I COMMENT Returns the Y level of the bedrock ceiling. COMMENT @@ -64,3 +70,4 @@ CLASS net/minecraft/class_5284 net/minecraft/world/gen/chunk/ChunkGeneratorSetti METHOD method_33757 hasAquifers ()Z METHOD method_33758 hasNoiseCaves ()Z METHOD method_33839 hasDeepslate ()Z + METHOD method_36212 getMinSurfaceLevel ()I diff --git a/mappings/net/minecraft/world/gen/feature/BastionRemnantFeature.mapping b/mappings/net/minecraft/world/gen/feature/BastionRemnantFeature.mapping index c96784f5d6..cc9b721a5a 100644 --- a/mappings/net/minecraft/world/gen/feature/BastionRemnantFeature.mapping +++ b/mappings/net/minecraft/world/gen/feature/BastionRemnantFeature.mapping @@ -1 +1,2 @@ CLASS net/minecraft/class_5175 net/minecraft/world/gen/feature/BastionRemnantFeature + FIELD field_31499 STRUCTURE_START_Y I diff --git a/mappings/net/minecraft/world/level/LevelProperties.mapping b/mappings/net/minecraft/world/level/LevelProperties.mapping index 0baf699439..e4c10dec25 100644 --- a/mappings/net/minecraft/world/level/LevelProperties.mapping +++ b/mappings/net/minecraft/world/level/LevelProperties.mapping @@ -30,6 +30,7 @@ CLASS net/minecraft/class_31 net/minecraft/world/level/LevelProperties FIELD field_25425 generatorOptions Lnet/minecraft/class_5285; FIELD field_25426 lifecycle Lcom/mojang/serialization/Lifecycle; FIELD field_26367 spawnAngle F + FIELD field_31843 WORLD_GEN_SETTINGS_KEY Ljava/lang/String; METHOD (Lcom/mojang/datafixers/DataFixer;ILnet/minecraft/class_2487;ZIIIFJJIIIZIZZZLnet/minecraft/class_2784$class_5200;IILjava/util/UUID;Ljava/util/Set;Lnet/minecraft/class_236;Lnet/minecraft/class_2487;Lnet/minecraft/class_2487;Lnet/minecraft/class_1940;Lnet/minecraft/class_5285;Lcom/mojang/serialization/Lifecycle;)V ARG 1 dataFixer ARG 2 dataVersion