1.18-pre2-4 stuff (#2836)

* 1.18-pre2 stuff

* SurfacePlacedFeatures -> VillagePlacedFeatures

* Update BlendingData.mapping

* stuff
This commit is contained in:
Shnupbups 2021-11-18 20:08:32 +11:00 committed by GitHub
parent 598f6f1eab
commit 4bdab49349
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
7 changed files with 96 additions and 18 deletions

View File

@ -34,3 +34,9 @@ CLASS net/minecraft/class_445 net/minecraft/client/gui/screen/CreditsScreen
ARG 1 text
METHOD method_37306 addEmptyLine ()V
METHOD method_37369 getSpeed ()F
METHOD method_39774 readPoem (Ljava/io/InputStreamReader;)V
METHOD method_39775 load (Ljava/lang/String;Lnet/minecraft/class_445$class_6824;)V
ARG 1 id
ARG 2 reader
METHOD method_39776 readCredits (Ljava/io/InputStreamReader;)V
CLASS class_6824 CreditsReader

View File

@ -312,6 +312,7 @@ CLASS net/minecraft/class_1309 net/minecraft/entity/LivingEntity
METHOD method_37410 processEquippedStack (Lnet/minecraft/class_1799;)V
ARG 1 stack
METHOD method_37416 getJumpBoostVelocityModifier ()D
METHOD method_39760 getFallSounds ()Lnet/minecraft/class_1309$class_6823;
METHOD method_5973 canTarget (Lnet/minecraft/class_1299;)Z
ARG 1 type
METHOD method_5989 getLootTable ()Lnet/minecraft/class_2960;
@ -593,3 +594,4 @@ CLASS net/minecraft/class_1309 net/minecraft/entity/LivingEntity
METHOD method_6132 applyArmorToDamage (Lnet/minecraft/class_1282;F)F
ARG 1 source
ARG 2 amount
CLASS class_6823 FallSounds

View File

@ -6,6 +6,7 @@ CLASS net/minecraft/class_6746 net/minecraft/world/chunk/BelowZeroRetrogen
FIELD field_35484 targetStatus Lnet/minecraft/class_2806;
FIELD field_35485 missingBedrock Ljava/util/BitSet;
FIELD field_35591 BELOW_ZERO_VIEW Lnet/minecraft/class_5539;
FIELD field_36192 CAVE_BIOMES Ljava/util/Set;
METHOD <init> (Lnet/minecraft/class_2806;Ljava/util/Optional;)V
ARG 1 targetStatus
ARG 2 missingBedrock
@ -16,3 +17,17 @@ CLASS net/minecraft/class_6746 net/minecraft/world/chunk/BelowZeroRetrogen
ARG 0 chunk
METHOD method_39471 (Lnet/minecraft/class_2839;Lnet/minecraft/class_2338;)V
ARG 1 pos
METHOD method_39767 getBiomeSupplier (Lnet/minecraft/class_6780;Lnet/minecraft/class_2378;Lnet/minecraft/class_2791;)Lnet/minecraft/class_6780;
ARG 0 biomeSupplier
ARG 1 biomeRegistry
ARG 2 chunk
METHOD method_39768 (Lnet/minecraft/class_6780;Ljava/util/Set;Lnet/minecraft/class_2791;IIILnet/minecraft/class_6544$class_6552;)Lnet/minecraft/class_1959;
ARG 3 x
ARG 4 y
ARG 5 z
ARG 6 noise
METHOD method_39769 (Lnet/minecraft/class_2839;Lnet/minecraft/class_2338;)V
ARG 1 pos
METHOD method_39770 hasNoBedrock ()Z
METHOD method_39771 fillChunkWithAir (Lnet/minecraft/class_2839;)V
ARG 0 chunk

View File

@ -15,7 +15,7 @@ CLASS net/minecraft/class_2791 net/minecraft/world/chunk/Chunk
FIELD field_34551 biome Lnet/minecraft/class_1959;
FIELD field_34552 structureStarts Ljava/util/Map;
FIELD field_34553 structureReferences Ljava/util/Map;
FIELD field_35468 blender Lnet/minecraft/class_6749;
FIELD field_35468 blendingData Lnet/minecraft/class_6749;
METHOD <init> (Lnet/minecraft/class_1923;Lnet/minecraft/class_2843;Lnet/minecraft/class_5539;Lnet/minecraft/class_2378;J[Lnet/minecraft/class_2826;Lnet/minecraft/class_6749;)V
ARG 1 pos
ARG 2 upgradeData
@ -104,7 +104,7 @@ CLASS net/minecraft/class_2791 net/minecraft/world/chunk/Chunk
ARG 1 type
METHOD method_39296 getTickSchedulers ()Lnet/minecraft/class_2791$class_6745;
METHOD method_39297 usesOldNoise ()Z
METHOD method_39299 getBlender ()Lnet/minecraft/class_6749;
METHOD method_39299 getBlendingData ()Lnet/minecraft/class_6749;
METHOD method_39300 getBelowZeroRetrogen ()Lnet/minecraft/class_6746;
METHOD method_39460 getHeightLimitView ()Lnet/minecraft/class_5539;
METHOD method_39461 hasBelowZeroRetrogen ()Z

View File

@ -1,19 +1,26 @@
CLASS net/minecraft/class_6749 net/minecraft/world/gen/chunk/Blender
FIELD field_35515 OLD_HEIGHT_LIMIT Lnet/minecraft/class_5539;
FIELD field_35519 SURFACE_BLOCKS Ljava/util/List;
METHOD method_39347 (ILnet/minecraft/class_2791;II)V
ARG 1 index
ARG 2 chunk
ARG 3 x
ARG 4 z
METHOD method_39349 getSurfaceHeight (Lnet/minecraft/class_2791;II)I
ARG 0 chunk
CLASS net/minecraft/class_6748 net/minecraft/world/gen/chunk/Blender
FIELD field_35501 NO_BLENDING Lnet/minecraft/class_6748;
FIELD field_35508 chunkRegion Lnet/minecraft/class_3233;
METHOD <init> (Lnet/minecraft/class_3233;Ljava/util/List;Ljava/util/List;)V
ARG 1 chunkRegion
METHOD method_39336 getNoBlending ()Lnet/minecraft/class_6748;
METHOD method_39342 getBlender (Lnet/minecraft/class_3233;)Lnet/minecraft/class_6748;
ARG 0 chunkRegion
METHOD method_39561 blendBiome (III)Lnet/minecraft/class_1959;
ARG 1 x
ARG 2 z
METHOD method_39350 (Lnet/minecraft/class_2791;Lnet/minecraft/class_2338;)Z
ARG 2 y
ARG 3 z
METHOD method_39563 getBiomeSupplier (Lnet/minecraft/class_6780;)Lnet/minecraft/class_6780;
ARG 1 biomeSupplier
METHOD method_39564 (Lnet/minecraft/class_6780;IIILnet/minecraft/class_6544$class_6552;)Lnet/minecraft/class_1959;
ARG 2 x
ARG 3 y
ARG 4 z
ARG 5 noise
METHOD method_39772 tickLeavesAndFluids (Lnet/minecraft/class_3233;Lnet/minecraft/class_2791;)V
ARG 0 chunkRegion
ARG 1 chunk
METHOD method_39773 tickLeavesAndFluids (Lnet/minecraft/class_2791;Lnet/minecraft/class_2338;)V
ARG 0 chunk
ARG 1 pos
METHOD method_39354 (Lnet/minecraft/class_2791;II)[D
ARG 0 chunk
ARG 1 x
ARG 2 z
CLASS class_6782 ChunkBlendingData

View File

@ -0,0 +1,34 @@
CLASS net/minecraft/class_6749 net/minecraft/world/gen/chunk/BlendingData
FIELD field_35515 OLD_HEIGHT_LIMIT Lnet/minecraft/class_5539;
FIELD field_35519 SURFACE_BLOCKS Ljava/util/List;
FIELD field_35682 CODEC Lcom/mojang/serialization/Codec;
FIELD field_35689 oldNoise Z
FIELD field_35692 heights [D
METHOD <init> (ZLjava/util/Optional;)V
ARG 1 oldNoise
METHOD method_39347 (ILnet/minecraft/class_2791;II)V
ARG 1 index
ARG 2 chunk
ARG 3 x
ARG 4 z
METHOD method_39349 getSurfaceHeight (Lnet/minecraft/class_2791;II)I
ARG 0 chunk
ARG 1 x
ARG 2 z
METHOD method_39350 isCollidableAndNotTreeAt (Lnet/minecraft/class_2791;Lnet/minecraft/class_2338;)Z
ARG 0 chunk
ARG 1 pos
METHOD method_39354 (Lnet/minecraft/class_2791;II)[D
ARG 0 chunk
ARG 1 x
ARG 2 z
METHOD method_39566 usesOldNoise ()Z
METHOD method_39570 getBlendingData (Lnet/minecraft/class_3233;II)Lnet/minecraft/class_6749;
ARG 0 chunkRegion
ARG 1 chunkX
ARG 2 chunkZ
METHOD method_39579 getAdjacentChunksWithNoise (Lnet/minecraft/class_5281;IIZ)Ljava/util/Set;
ARG 0 access
ARG 1 chunkX
ARG 2 chunkZ
ARG 3 newNoise

View File

@ -0,0 +1,14 @@
CLASS net/minecraft/class_6825 net/minecraft/world/gen/feature/VillagePlacedFeatures
FIELD field_36195 PILE_HAY Lnet/minecraft/class_6796;
FIELD field_36196 PILE_MELON Lnet/minecraft/class_6796;
FIELD field_36197 PILE_SNOW Lnet/minecraft/class_6796;
FIELD field_36198 PILE_ICE Lnet/minecraft/class_6796;
FIELD field_36199 PILE_PUMPKIN Lnet/minecraft/class_6796;
FIELD field_36200 OAK Lnet/minecraft/class_6796;
FIELD field_36201 ACACIA Lnet/minecraft/class_6796;
FIELD field_36202 SPRUCE Lnet/minecraft/class_6796;
FIELD field_36203 PINE Lnet/minecraft/class_6796;
FIELD field_36204 PATCH_CACTUS Lnet/minecraft/class_6796;
FIELD field_36205 FLOWER_PLAIN Lnet/minecraft/class_6796;
FIELD field_36206 PATCH_TAIGA_GRASS Lnet/minecraft/class_6796;
FIELD field_36207 PATCH_BERRY_BUSH Lnet/minecraft/class_6796;