From a049e1828bc2467b63b5792607c9928928ad771f Mon Sep 17 00:00:00 2001 From: martmists Date: Sun, 23 Feb 2020 00:05:44 +0100 Subject: [PATCH] map MineshaftGenerator methods (#1131) * MineshaftGenerator$MineshaftStairs#method_14720(6) -> getBoundingBox * MineshaftGenerator$MineshaftCrossing#method_14717(6) -> getBoundingBox * MineshaftGenerator$MineshaftCorridor#method_14714(6) -> getBoundingBox * MineshaftGenerator#method_14712(8) -> getRandomJigsaw * MineshaftGenerator#method_14711(8) -> tryGenerateJigsaw * StructurePiece#method_14918(3) -> placeJigsaw * MineshaftGenerator$MineshaftPart#method_16443(0) -> getPlanksType * MineshaftGenerator$MineshaftPart#method_14718(0) -> getFenceType * StructurePiece#method_14923(0) -> getLength * StructurePiece%field_15316 -> length * StructurePiece#method_14932(2) -> getOverlappingPiece --- .../minecraft/structure/MineshaftGenerator.mapping | 11 +++++++---- .../net/minecraft/structure/StructurePiece.mapping | 4 ++++ 2 files changed, 11 insertions(+), 4 deletions(-) diff --git a/mappings/net/minecraft/structure/MineshaftGenerator.mapping b/mappings/net/minecraft/structure/MineshaftGenerator.mapping index 33c5e06861..fd7bf56705 100644 --- a/mappings/net/minecraft/structure/MineshaftGenerator.mapping +++ b/mappings/net/minecraft/structure/MineshaftGenerator.mapping @@ -1,24 +1,27 @@ CLASS net/minecraft/class_3353 net/minecraft/structure/MineshaftGenerator - METHOD method_14711 (Lnet/minecraft/class_3443;Ljava/util/List;Ljava/util/Random;IIILnet/minecraft/class_2350;I)Lnet/minecraft/class_3353$class_3356; + METHOD method_14711 tryGenerateJigsaw (Lnet/minecraft/class_3443;Ljava/util/List;Ljava/util/Random;IIILnet/minecraft/class_2350;I)Lnet/minecraft/class_3353$class_3356; ARG 2 random - METHOD method_14712 (Ljava/util/List;Ljava/util/Random;IIILnet/minecraft/class_2350;ILnet/minecraft/class_3098$class_3100;)Lnet/minecraft/class_3353$class_3356; + METHOD method_14712 getRandomJigsaw (Ljava/util/List;Ljava/util/Random;IIILnet/minecraft/class_2350;ILnet/minecraft/class_3098$class_3100;)Lnet/minecraft/class_3353$class_3356; ARG 1 random CLASS class_3354 MineshaftCorridor FIELD field_14413 length I FIELD field_14414 hasSpawner Z FIELD field_14415 hasCobwebs Z FIELD field_14416 hasRails Z + METHOD method_14714 getBoundingBox (Ljava/util/List;Ljava/util/Random;IIILnet/minecraft/class_2350;)Lnet/minecraft/class_3341; CLASS class_3355 MineshaftCrossing FIELD field_14419 twoFloors Z FIELD field_14420 direction Lnet/minecraft/class_2350; - METHOD method_14717 (Ljava/util/List;Ljava/util/Random;IIILnet/minecraft/class_2350;)Lnet/minecraft/class_3341; + METHOD method_14717 getBoundingBox (Ljava/util/List;Ljava/util/Random;IIILnet/minecraft/class_2350;)Lnet/minecraft/class_3341; ARG 5 facing CLASS class_3356 MineshaftPart FIELD field_14421 mineshaftType Lnet/minecraft/class_3098$class_3100; + METHOD method_14718 getFenceType ()Lnet/minecraft/class_2680; + METHOD method_16443 getPlanksType ()Lnet/minecraft/class_2680; CLASS class_3357 MineshaftRoom FIELD field_14422 entrances Ljava/util/List; METHOD (ILjava/util/Random;IILnet/minecraft/class_3098$class_3100;)V ARG 2 random CLASS class_3358 MineshaftStairs - METHOD method_14720 (Ljava/util/List;Ljava/util/Random;IIILnet/minecraft/class_2350;)Lnet/minecraft/class_3341; + METHOD method_14720 getBoundingBox (Ljava/util/List;Ljava/util/Random;IIILnet/minecraft/class_2350;)Lnet/minecraft/class_3341; ARG 1 random diff --git a/mappings/net/minecraft/structure/StructurePiece.mapping b/mappings/net/minecraft/structure/StructurePiece.mapping index d73dbbaca8..6ed943196e 100644 --- a/mappings/net/minecraft/structure/StructurePiece.mapping +++ b/mappings/net/minecraft/structure/StructurePiece.mapping @@ -5,6 +5,7 @@ CLASS net/minecraft/class_3443 net/minecraft/structure/StructurePiece FIELD field_15313 rotation Lnet/minecraft/class_2470; FIELD field_15314 AIR Lnet/minecraft/class_2680; FIELD field_15315 boundingBox Lnet/minecraft/class_3341; + FIELD field_15316 length I FIELD field_16712 type Lnet/minecraft/class_3773; METHOD (Lnet/minecraft/class_3773;I)V ARG 1 type @@ -25,6 +26,7 @@ CLASS net/minecraft/class_3443 net/minecraft/structure/StructurePiece ARG 3 x ARG 4 y ARG 5 z + METHOD method_14918 placeJigsaw (Lnet/minecraft/class_3443;Ljava/util/List;Ljava/util/Random;)V METHOD method_14919 (Lnet/minecraft/class_1936;Lnet/minecraft/class_3341;IIIIIILnet/minecraft/class_2680;Z)V ARG 1 world ARG 2 bounds @@ -46,6 +48,7 @@ CLASS net/minecraft/class_3443 net/minecraft/structure/StructurePiece ARG 1 x ARG 2 y ARG 3 z + METHOD method_14923 getLength ()I METHOD method_14924 applyYTransform (I)I METHOD method_14926 setOrientation (Lnet/minecraft/class_2350;)V ARG 1 orientation @@ -69,6 +72,7 @@ CLASS net/minecraft/class_3443 net/minecraft/structure/StructurePiece ARG 3 random ARG 4 box ARG 5 pos + METHOD method_14932 getOverlappingPiece (Ljava/util/List;Lnet/minecraft/class_3341;)Lnet/minecraft/class_3443; METHOD method_14933 fillWithOutlineUnderSealevel (Lnet/minecraft/class_1936;Lnet/minecraft/class_3341;Ljava/util/Random;FIIIIIILnet/minecraft/class_2680;Lnet/minecraft/class_2680;ZZ)V ARG 3 random METHOD method_14934 getFacing ()Lnet/minecraft/class_2350;