From 4895fbf31b4b317eff5f7dff9638b51619bbd0e6 Mon Sep 17 00:00:00 2001 From: Patrick Date: Mon, 12 Oct 2020 12:35:16 -0400 Subject: [PATCH] old structure generation mapping (#1788) --- .../structure/MineshaftGenerator.mapping | 87 ++++++- .../structure/NetherFortressGenerator.mapping | 239 +++++++++++++++++- .../structure/StrongholdGenerator.mapping | 225 ++++++++++++++++- .../structure/StructurePiece.mapping | 44 +++- .../structure/StructureStart.mapping | 8 + 5 files changed, 589 insertions(+), 14 deletions(-) diff --git a/mappings/net/minecraft/structure/MineshaftGenerator.mapping b/mappings/net/minecraft/structure/MineshaftGenerator.mapping index fd7bf56705..2ab2a6d937 100644 --- a/mappings/net/minecraft/structure/MineshaftGenerator.mapping +++ b/mappings/net/minecraft/structure/MineshaftGenerator.mapping @@ -1,27 +1,108 @@ CLASS net/minecraft/class_3353 net/minecraft/structure/MineshaftGenerator - 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; + METHOD method_14711 pieceGenerator (Lnet/minecraft/class_3443;Ljava/util/List;Ljava/util/Random;IIILnet/minecraft/class_2350;I)Lnet/minecraft/class_3353$class_3356; + ARG 0 start + ARG 1 pieces ARG 2 random - 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 3 x + ARG 4 y + ARG 5 z + ARG 6 orientation + ARG 7 chainLength + METHOD method_14712 pickPiece (Ljava/util/List;Ljava/util/Random;IIILnet/minecraft/class_2350;ILnet/minecraft/class_3098$class_3100;)Lnet/minecraft/class_3353$class_3356; + ARG 0 pieces ARG 1 random + ARG 2 x + ARG 3 y + ARG 4 z + ARG 5 orientation + ARG 6 chainLength + ARG 7 type 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 (ILjava/util/Random;Lnet/minecraft/class_3341;Lnet/minecraft/class_2350;Lnet/minecraft/class_3098$class_3100;)V + ARG 1 chainLength + ARG 2 random + ARG 3 boundingBox + ARG 4 orientation + ARG 5 type + METHOD method_14713 generateSupports (Lnet/minecraft/class_5281;Lnet/minecraft/class_3341;IIIIILjava/util/Random;)V + ARG 2 boundingBox + ARG 3 minX + ARG 4 minY + ARG 5 z + ARG 6 maxY + ARG 7 maxX + ARG 8 random METHOD method_14714 getBoundingBox (Ljava/util/List;Ljava/util/Random;IIILnet/minecraft/class_2350;)Lnet/minecraft/class_3341; + ARG 0 pieces + ARG 1 random + ARG 2 x + ARG 3 y + ARG 4 z + ARG 5 orientation + METHOD method_14715 addCobwebsUnderground (Lnet/minecraft/class_5281;Lnet/minecraft/class_3341;Ljava/util/Random;FIII)V + ARG 2 boundingBox + ARG 3 random + ARG 4 threshold + ARG 5 x + ARG 6 y + ARG 7 z CLASS class_3355 MineshaftCrossing FIELD field_14419 twoFloors Z FIELD field_14420 direction Lnet/minecraft/class_2350; + METHOD (ILnet/minecraft/class_3341;Lnet/minecraft/class_2350;Lnet/minecraft/class_3098$class_3100;)V + ARG 1 chainLength + ARG 2 boundingBox + ARG 3 orientation + ARG 4 type + METHOD method_14716 generateCrossingPilliar (Lnet/minecraft/class_5281;Lnet/minecraft/class_3341;IIII)V + ARG 2 boundingBox + ARG 3 x + ARG 4 minY + ARG 5 z + ARG 6 maxY METHOD method_14717 getBoundingBox (Ljava/util/List;Ljava/util/Random;IIILnet/minecraft/class_2350;)Lnet/minecraft/class_3341; - ARG 5 facing + ARG 0 pieces + ARG 1 random + ARG 2 x + ARG 3 y + ARG 4 z + ARG 5 orientation CLASS class_3356 MineshaftPart FIELD field_14421 mineshaftType Lnet/minecraft/class_3098$class_3100; + METHOD (Lnet/minecraft/class_3773;ILnet/minecraft/class_3098$class_3100;)V + ARG 1 structurePieceType + ARG 2 chainLength + ARG 3 type METHOD method_14718 getFenceType ()Lnet/minecraft/class_2680; + METHOD method_14719 isSolidCeiling (Lnet/minecraft/class_1922;Lnet/minecraft/class_3341;IIII)Z + ARG 2 boundingBox + ARG 3 minX + ARG 4 maxX + ARG 5 y + ARG 6 z 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 1 chainLength ARG 2 random + ARG 3 x + ARG 4 z + ARG 5 type CLASS class_3358 MineshaftStairs + METHOD (ILnet/minecraft/class_3341;Lnet/minecraft/class_2350;Lnet/minecraft/class_3098$class_3100;)V + ARG 1 chainLength + ARG 2 boundingBox + ARG 3 orientation + ARG 4 type METHOD method_14720 getBoundingBox (Ljava/util/List;Ljava/util/Random;IIILnet/minecraft/class_2350;)Lnet/minecraft/class_3341; + ARG 0 pieces ARG 1 random + ARG 2 x + ARG 3 y + ARG 4 z + ARG 5 orientation diff --git a/mappings/net/minecraft/structure/NetherFortressGenerator.mapping b/mappings/net/minecraft/structure/NetherFortressGenerator.mapping index b1525dc324..e4f91dfd66 100644 --- a/mappings/net/minecraft/structure/NetherFortressGenerator.mapping +++ b/mappings/net/minecraft/structure/NetherFortressGenerator.mapping @@ -1,30 +1,267 @@ CLASS net/minecraft/class_3390 net/minecraft/structure/NetherFortressGenerator - METHOD method_14795 generatePiece (Lnet/minecraft/class_3390$class_3404;Ljava/util/List;Ljava/util/Random;IIILnet/minecraft/class_2350;I)Lnet/minecraft/class_3390$class_3403; + FIELD field_14493 ALL_CORRIDOR_PIECES [Lnet/minecraft/class_3390$class_3404; + FIELD field_14494 ALL_BRIDGE_PIECES [Lnet/minecraft/class_3390$class_3404; + METHOD method_14795 createPiece (Lnet/minecraft/class_3390$class_3404;Ljava/util/List;Ljava/util/Random;IIILnet/minecraft/class_2350;I)Lnet/minecraft/class_3390$class_3403; + ARG 0 pieceData + ARG 1 pieces + ARG 2 random + ARG 3 x + ARG 4 y + ARG 5 z + ARG 6 orientation + ARG 7 chainLength CLASS class_3391 BridgeCrossing + METHOD (ILnet/minecraft/class_3341;Lnet/minecraft/class_2350;)V + ARG 1 chainLength + ARG 2 boundingBox + ARG 3 orientation METHOD (Ljava/util/Random;II)V ARG 1 random ARG 2 x ARG 3 z + METHOD method_14796 create (Ljava/util/List;IIILnet/minecraft/class_2350;I)Lnet/minecraft/class_3390$class_3391; + ARG 0 pieces + ARG 1 x + ARG 2 y + ARG 3 z + ARG 4 orientation + ARG 5 chainLength CLASS class_3392 BridgeEnd FIELD field_14495 seed I + METHOD (ILjava/util/Random;Lnet/minecraft/class_3341;Lnet/minecraft/class_2350;)V + ARG 1 chainLength + ARG 2 random + ARG 3 boundingBox + ARG 4 orientation + METHOD method_14797 create (Ljava/util/List;Ljava/util/Random;IIILnet/minecraft/class_2350;I)Lnet/minecraft/class_3390$class_3392; + ARG 0 pieces + ARG 1 random + ARG 2 x + ARG 3 y + ARG 4 z + ARG 5 orientation + ARG 6 chainLength CLASS class_3393 Bridge + METHOD (ILjava/util/Random;Lnet/minecraft/class_3341;Lnet/minecraft/class_2350;)V + ARG 1 chainLength + ARG 2 random + ARG 3 boundingBox + ARG 4 orientation + METHOD method_14798 create (Ljava/util/List;Ljava/util/Random;IIILnet/minecraft/class_2350;I)Lnet/minecraft/class_3390$class_3393; + ARG 0 pieces + ARG 1 random + ARG 2 x + ARG 3 y + ARG 4 z + ARG 5 orientation + ARG 6 chainLength CLASS class_3394 CorridorStairs + METHOD (ILnet/minecraft/class_3341;Lnet/minecraft/class_2350;)V + ARG 1 chainLength + ARG 2 boundingBox + ARG 3 orientation + METHOD method_14799 create (Ljava/util/List;IIILnet/minecraft/class_2350;I)Lnet/minecraft/class_3390$class_3394; + ARG 0 pieces + ARG 1 x + ARG 2 y + ARG 3 z + ARG 4 orientation + ARG 5 chainLength CLASS class_3395 CorridorBalcony + METHOD (ILnet/minecraft/class_3341;Lnet/minecraft/class_2350;)V + ARG 1 chainLength + ARG 2 boundingBox + ARG 3 orientation + METHOD method_14800 create (Ljava/util/List;IIILnet/minecraft/class_2350;I)Lnet/minecraft/class_3390$class_3395; + ARG 0 pieces + ARG 1 x + ARG 2 y + ARG 3 z + ARG 4 orientation + ARG 5 chainLength CLASS class_3396 CorridorExit + METHOD (ILjava/util/Random;Lnet/minecraft/class_3341;Lnet/minecraft/class_2350;)V + ARG 1 chainLength + ARG 2 random + ARG 3 boundingBox + ARG 4 orientation + METHOD method_14801 create (Ljava/util/List;Ljava/util/Random;IIILnet/minecraft/class_2350;I)Lnet/minecraft/class_3390$class_3396; + ARG 0 pieces + ARG 1 random + ARG 2 x + ARG 3 y + ARG 4 z + ARG 5 orientation + ARG 6 chainLength CLASS class_3397 CorridorCrossing + METHOD (ILnet/minecraft/class_3341;Lnet/minecraft/class_2350;)V + ARG 1 chainLength + ARG 2 boundingBox + ARG 3 orientation + METHOD method_14802 create (Ljava/util/List;IIILnet/minecraft/class_2350;I)Lnet/minecraft/class_3390$class_3397; + ARG 0 pieces + ARG 1 x + ARG 2 y + ARG 3 z + ARG 4 orientation + ARG 5 chainLength CLASS class_3398 CorridorLeftTurn FIELD field_14496 containsChest Z + METHOD (ILjava/util/Random;Lnet/minecraft/class_3341;Lnet/minecraft/class_2350;)V + ARG 1 chainLength + ARG 2 random + ARG 3 boundingBox + ARG 4 orientation + METHOD method_14803 create (Ljava/util/List;Ljava/util/Random;IIILnet/minecraft/class_2350;I)Lnet/minecraft/class_3390$class_3398; + ARG 0 pieces + ARG 1 random + ARG 2 x + ARG 3 y + ARG 4 z + ARG 5 orientation + ARG 6 chainLength CLASS class_3399 SmallCorridor + METHOD (ILnet/minecraft/class_3341;Lnet/minecraft/class_2350;)V + ARG 1 chainLength + ARG 2 boundingBox + ARG 3 orientation + METHOD method_14804 create (Ljava/util/List;IIILnet/minecraft/class_2350;I)Lnet/minecraft/class_3390$class_3399; + ARG 0 pieces + ARG 1 x + ARG 2 y + ARG 3 z + ARG 4 orientation + ARG 5 chainLength CLASS class_3400 CorridorRightTurn FIELD field_14497 containsChest Z + METHOD (ILjava/util/Random;Lnet/minecraft/class_3341;Lnet/minecraft/class_2350;)V + ARG 1 chainLength + ARG 2 random + ARG 3 boundingBox + ARG 4 orientation + METHOD method_14805 create (Ljava/util/List;Ljava/util/Random;IIILnet/minecraft/class_2350;I)Lnet/minecraft/class_3390$class_3400; + ARG 0 pieces + ARG 1 random + ARG 2 x + ARG 3 y + ARG 4 z + ARG 5 orientation + ARG 6 chainLength CLASS class_3401 CorridorNetherWartsRoom + METHOD (ILnet/minecraft/class_3341;Lnet/minecraft/class_2350;)V + ARG 1 chainLength + ARG 2 boundingBox + ARG 3 orientation + METHOD method_14806 create (Ljava/util/List;IIILnet/minecraft/class_2350;I)Lnet/minecraft/class_3390$class_3401; + ARG 0 pieces + ARG 1 x + ARG 2 y + ARG 3 z + ARG 4 orientation + ARG 5 chainlength CLASS class_3402 BridgePlatform FIELD field_14498 hasBlazeSpawner Z + METHOD (ILnet/minecraft/class_3341;Lnet/minecraft/class_2350;)V + ARG 1 chainLength + ARG 2 boundingBox + ARG 3 orientation + METHOD method_14807 create (Ljava/util/List;IIIILnet/minecraft/class_2350;)Lnet/minecraft/class_3390$class_3402; + ARG 0 pieces + ARG 1 x + ARG 2 y + ARG 3 z + ARG 4 chainLength + ARG 5 orientation CLASS class_3403 Piece + METHOD method_14808 fillSEOpening (Lnet/minecraft/class_3390$class_3407;Ljava/util/List;Ljava/util/Random;IIZ)Lnet/minecraft/class_3443; + ARG 1 start + ARG 2 pieces + ARG 3 random + ARG 4 heightOffset + ARG 5 leftRightOffset + ARG 6 inside + METHOD method_14809 isInbounds (Lnet/minecraft/class_3341;)Z + ARG 0 boundingBox + METHOD method_14810 checkRemainingPieces (Ljava/util/List;)I + ARG 1 possiblePieces + METHOD method_14811 pickPiece (Lnet/minecraft/class_3390$class_3407;Ljava/util/List;Ljava/util/List;Ljava/util/Random;IIILnet/minecraft/class_2350;I)Lnet/minecraft/class_3390$class_3403; + ARG 1 start + ARG 2 possiblePieces + ARG 3 pieces + ARG 4 random + ARG 5 x + ARG 6 y + ARG 7 z + ARG 8 orientation + ARG 9 chainLength + METHOD method_14812 fillNWOpening (Lnet/minecraft/class_3390$class_3407;Ljava/util/List;Ljava/util/Random;IIZ)Lnet/minecraft/class_3443; + ARG 1 start + ARG 2 pieces + ARG 3 random + ARG 4 heightOffset + ARG 5 leftRightOffset + ARG 6 inside + METHOD method_14813 pieceGenerator (Lnet/minecraft/class_3390$class_3407;Ljava/util/List;Ljava/util/Random;IIILnet/minecraft/class_2350;IZ)Lnet/minecraft/class_3443; + ARG 1 start + ARG 2 pieces + ARG 3 random + ARG 4 x + ARG 5 y + ARG 6 z + ARG 7 orientation + ARG 8 chainLength + ARG 9 inside + METHOD method_14814 fillForwardOpening (Lnet/minecraft/class_3390$class_3407;Ljava/util/List;Ljava/util/Random;IIZ)Lnet/minecraft/class_3443; + ARG 1 start + ARG 2 pieces + ARG 3 random + ARG 4 leftRightOffset + ARG 5 heightOffset + ARG 6 inside CLASS class_3404 PieceData + FIELD field_14499 limit I + FIELD field_14500 repeatable Z FIELD field_14501 pieceType Ljava/lang/Class; + FIELD field_14502 generatedCount I + FIELD field_14503 weight I + METHOD (Ljava/lang/Class;II)V + ARG 1 pieceType + ARG 2 weight + ARG 3 limit + METHOD (Ljava/lang/Class;IIZ)V + ARG 1 pieceType + ARG 2 weight + ARG 3 limit + ARG 4 repeatable + METHOD method_14815 canGenerate ()Z + METHOD method_14816 canGenerate (I)Z + ARG 1 chainLength CLASS class_3405 BridgeSmallCrossing + METHOD (ILnet/minecraft/class_3341;Lnet/minecraft/class_2350;)V + ARG 1 chainLength + ARG 2 boundingBox + ARG 3 orientation + METHOD method_14817 create (Ljava/util/List;IIILnet/minecraft/class_2350;I)Lnet/minecraft/class_3390$class_3405; + ARG 0 pieces + ARG 1 x + ARG 2 y + ARG 3 z + ARG 4 orientation + ARG 5 chainLength CLASS class_3406 BridgeStairs + METHOD (ILnet/minecraft/class_3341;Lnet/minecraft/class_2350;)V + ARG 1 chainLength + ARG 2 boundingBox + ARG 3 orientation + METHOD method_14818 create (Ljava/util/List;IIIILnet/minecraft/class_2350;)Lnet/minecraft/class_3390$class_3406; + ARG 0 pieces + ARG 1 x + ARG 2 y + ARG 3 z + ARG 4 chainlength + ARG 5 orientation CLASS class_3407 Start FIELD field_14504 corridorPieces Ljava/util/List; + FIELD field_14505 pieces Ljava/util/List; + FIELD field_14506 lastPiece Lnet/minecraft/class_3390$class_3404; FIELD field_14507 bridgePieces Ljava/util/List; diff --git a/mappings/net/minecraft/structure/StrongholdGenerator.mapping b/mappings/net/minecraft/structure/StrongholdGenerator.mapping index 6d28a1c193..2d75a35af9 100644 --- a/mappings/net/minecraft/structure/StrongholdGenerator.mapping +++ b/mappings/net/minecraft/structure/StrongholdGenerator.mapping @@ -1,46 +1,251 @@ CLASS net/minecraft/class_3421 net/minecraft/structure/StrongholdGenerator FIELD field_15263 STONE_BRICK_RANDOMIZER Lnet/minecraft/class_3421$class_3432; - FIELD field_15265 ALL_PIECE_SETTINGS [Lnet/minecraft/class_3421$class_3427; + FIELD field_15264 totalWeight I + FIELD field_15265 ALL_PIECES [Lnet/minecraft/class_3421$class_3427; FIELD field_15266 activePieceType Ljava/lang/Class; - FIELD field_15267 possiblePieceSettings Ljava/util/List; + FIELD field_15267 possiblePieces Ljava/util/List; + METHOD method_14847 createPiece (Ljava/lang/Class;Ljava/util/List;Ljava/util/Random;IIILnet/minecraft/class_2350;I)Lnet/minecraft/class_3421$class_3437; + ARG 0 pieceType + ARG 1 pieces + ARG 2 random + ARG 3 x + ARG 4 y + ARG 5 z + ARG 6 orientation + ARG 7 chainLength + METHOD method_14851 pickPiece (Lnet/minecraft/class_3421$class_3434;Ljava/util/List;Ljava/util/Random;IIILnet/minecraft/class_2350;I)Lnet/minecraft/class_3421$class_3437; + ARG 0 start + ARG 1 pieces + ARG 2 random + ARG 3 x + ARG 4 y + ARG 5 z + ARG 6 orientation + ARG 7 chainLength + METHOD method_14852 checkRemainingPieces ()Z + METHOD method_14854 pieceGenerator (Lnet/minecraft/class_3421$class_3434;Ljava/util/List;Ljava/util/Random;IIILnet/minecraft/class_2350;I)Lnet/minecraft/class_3443; + ARG 0 start + ARG 1 pieces + ARG 2 random + ARG 3 x + ARG 4 y + ARG 5 z + ARG 6 orientation + ARG 7 chainLength METHOD method_14855 init ()V CLASS class_3422 ChestCorridor FIELD field_15268 chestGenerated Z + METHOD (ILjava/util/Random;Lnet/minecraft/class_3341;Lnet/minecraft/class_2350;)V + ARG 1 chainLength + ARG 2 random + ARG 3 boundingBox + ARG 4 orientation + METHOD method_14856 create (Ljava/util/List;Ljava/util/Random;IIILnet/minecraft/class_2350;I)Lnet/minecraft/class_3421$class_3422; + ARG 0 pieces + ARG 1 random + ARG 2 x + ARG 3 y + ARG 4 z + ARG 5 orientation + ARG 6 chainlength CLASS class_3423 SmallCorridor FIELD field_15269 length I + METHOD (ILnet/minecraft/class_3341;Lnet/minecraft/class_2350;)V + ARG 1 chainLength + ARG 2 boundingBox + ARG 3 orientation + METHOD method_14857 create (Ljava/util/List;Ljava/util/Random;IIILnet/minecraft/class_2350;)Lnet/minecraft/class_3341; + ARG 0 pieces + ARG 1 random + ARG 2 x + ARG 3 y + ARG 4 z + ARG 5 orientation CLASS class_3424 FiveWayCrossing FIELD field_15270 upperRightExists Z FIELD field_15271 lowerRightExists Z FIELD field_15272 upperLeftExists Z FIELD field_15273 lowerLeftExists Z + METHOD (ILjava/util/Random;Lnet/minecraft/class_3341;Lnet/minecraft/class_2350;)V + ARG 1 chainLength + ARG 2 random + ARG 3 boundingBox + ARG 4 orientation + METHOD method_14858 create (Ljava/util/List;Ljava/util/Random;IIILnet/minecraft/class_2350;I)Lnet/minecraft/class_3421$class_3424; + ARG 0 pieces + ARG 1 random + ARG 2 x + ARG 3 y + ARG 4 z + ARG 5 orientation + ARG 6 chainLength CLASS class_3425 LeftTurn + METHOD (ILjava/util/Random;Lnet/minecraft/class_3341;Lnet/minecraft/class_2350;)V + ARG 1 chainLength + ARG 2 random + ARG 3 boundingBox + ARG 4 orientation + METHOD method_14859 create (Ljava/util/List;Ljava/util/Random;IIILnet/minecraft/class_2350;I)Lnet/minecraft/class_3421$class_3425; + ARG 0 pieces + ARG 1 random + ARG 2 x + ARG 3 y + ARG 4 z + ARG 5 orientation + ARG 6 chainLength CLASS class_3426 Library FIELD field_15274 tall Z - CLASS class_3427 PieceSetting + METHOD (ILjava/util/Random;Lnet/minecraft/class_3341;Lnet/minecraft/class_2350;)V + ARG 1 chainLength + ARG 2 random + ARG 3 boundingBox + ARG 4 orientation + METHOD method_14860 create (Ljava/util/List;Ljava/util/Random;IIILnet/minecraft/class_2350;I)Lnet/minecraft/class_3421$class_3426; + ARG 0 pieces + ARG 1 random + ARG 2 x + ARG 3 y + ARG 4 z + ARG 5 orientation + ARG 6 chainLength + CLASS class_3427 PieceData FIELD field_15275 limit I FIELD field_15276 pieceType Ljava/lang/Class; FIELD field_15277 generatedCount I + FIELD field_15278 weight I + METHOD (Ljava/lang/Class;II)V + ARG 1 pieceType + ARG 2 weight + ARG 3 limit METHOD method_14861 canGenerate ()Z METHOD method_14862 canGenerate (I)Z - ARG 1 depth + ARG 1 chainLength CLASS class_3428 PortalRoom FIELD field_15279 spawnerPlaced Z + METHOD (ILnet/minecraft/class_3341;Lnet/minecraft/class_2350;)V + ARG 1 chainLength + ARG 2 boundingBox + ARG 3 orientation + METHOD method_14863 create (Ljava/util/List;IIILnet/minecraft/class_2350;I)Lnet/minecraft/class_3421$class_3428; + ARG 0 pieces + ARG 1 x + ARG 2 y + ARG 3 z + ARG 4 orientation + ARG 5 chainLength CLASS class_3429 PrisonHall + METHOD (ILjava/util/Random;Lnet/minecraft/class_3341;Lnet/minecraft/class_2350;)V + ARG 1 chainLength + ARG 2 random + ARG 3 boundingBox + ARG 4 orientation + METHOD method_14864 create (Ljava/util/List;Ljava/util/Random;IIILnet/minecraft/class_2350;I)Lnet/minecraft/class_3421$class_3429; + ARG 0 pieces + ARG 1 random + ARG 2 x + ARG 3 y + ARG 4 z + ARG 5 orientation + ARG 6 chainLength CLASS class_3430 RightTurn + METHOD (ILjava/util/Random;Lnet/minecraft/class_3341;Lnet/minecraft/class_2350;)V + ARG 1 chainLength + ARG 2 random + ARG 3 boundingBox + ARG 4 orientation + METHOD method_16652 create (Ljava/util/List;Ljava/util/Random;IIILnet/minecraft/class_2350;I)Lnet/minecraft/class_3421$class_3430; + ARG 0 pieces + ARG 1 random + ARG 2 x + ARG 3 y + ARG 4 z + ARG 5 orientation + ARG 6 chainLength CLASS class_3431 SquareRoom FIELD field_15280 roomType I + METHOD (ILjava/util/Random;Lnet/minecraft/class_3341;Lnet/minecraft/class_2350;)V + ARG 1 chainLength + ARG 2 random + ARG 3 boundingBox + ARG 4 orientation + METHOD method_14865 create (Ljava/util/List;Ljava/util/Random;IIILnet/minecraft/class_2350;I)Lnet/minecraft/class_3421$class_3431; + ARG 0 pieces + ARG 1 random + ARG 2 x + ARG 3 y + ARG 4 z + ARG 5 orientation + ARG 6 chainLength CLASS class_3432 StoneBrickRandomizer CLASS class_3433 SpiralStaircase FIELD field_15281 isStructureStart Z + METHOD (ILjava/util/Random;Lnet/minecraft/class_3341;Lnet/minecraft/class_2350;)V + ARG 1 chainLength + ARG 2 random + ARG 3 boundingBox + ARG 4 orientation + METHOD (Lnet/minecraft/class_3773;ILjava/util/Random;II)V + ARG 1 structurePieceType + ARG 2 chainLength + ARG 3 random + ARG 4 x + ARG 5 z + METHOD method_14866 create (Ljava/util/List;Ljava/util/Random;IIILnet/minecraft/class_2350;I)Lnet/minecraft/class_3421$class_3433; + ARG 0 pieces + ARG 1 random + ARG 2 x + ARG 3 y + ARG 4 z + ARG 5 orientation + ARG 6 chainLength CLASS class_3434 Start + FIELD field_15282 pieces Ljava/util/List; + FIELD field_15283 portalRoom Lnet/minecraft/class_3421$class_3428; + FIELD field_15284 lastPiece Lnet/minecraft/class_3421$class_3427; + METHOD (Ljava/util/Random;II)V + ARG 1 random CLASS class_3435 Corridor FIELD field_15285 rightExitExists Z FIELD field_15286 leftExitExists Z + METHOD (ILjava/util/Random;Lnet/minecraft/class_3341;Lnet/minecraft/class_2350;)V + ARG 1 chainLength + ARG 2 random + ARG 3 boundingBox + ARG 4 orientation + METHOD method_14867 create (Ljava/util/List;Ljava/util/Random;IIILnet/minecraft/class_2350;I)Lnet/minecraft/class_3421$class_3435; + ARG 0 pieces + ARG 1 random + ARG 2 x + ARG 3 y + ARG 4 z + ARG 5 orientation + ARG 6 chainLength CLASS class_3436 Stairs + METHOD (ILjava/util/Random;Lnet/minecraft/class_3341;Lnet/minecraft/class_2350;)V + ARG 1 chainLength + ARG 2 random + ARG 3 boundingBox + ARG 4 orientation + METHOD method_14868 create (Ljava/util/List;Ljava/util/Random;IIILnet/minecraft/class_2350;I)Lnet/minecraft/class_3421$class_3436; + ARG 0 pieces + ARG 1 random + ARG 2 x + ARG 3 y + ARG 4 z + ARG 5 orientation + ARG 6 chainLength CLASS class_3437 Piece FIELD field_15287 entryDoor Lnet/minecraft/class_3421$class_3437$class_3438; METHOD method_14869 getRandomEntrance (Ljava/util/Random;)Lnet/minecraft/class_3421$class_3437$class_3438; ARG 1 random + METHOD method_14870 fillNWOpening (Lnet/minecraft/class_3421$class_3434;Ljava/util/List;Ljava/util/Random;II)Lnet/minecraft/class_3443; + ARG 1 start + ARG 2 pieces + ARG 3 random + ARG 4 heightOffset + ARG 5 leftRightOffset + METHOD method_14871 isInbounds (Lnet/minecraft/class_3341;)Z + ARG 0 boundingBox METHOD method_14872 generateEntrance (Lnet/minecraft/class_5281;Ljava/util/Random;Lnet/minecraft/class_3341;Lnet/minecraft/class_3421$class_3437$class_3438;III)V ARG 2 random ARG 3 boundingBox @@ -48,5 +253,17 @@ CLASS net/minecraft/class_3421 net/minecraft/structure/StrongholdGenerator ARG 5 x ARG 6 y ARG 7 z + METHOD method_14873 fillSEOpening (Lnet/minecraft/class_3421$class_3434;Ljava/util/List;Ljava/util/Random;II)Lnet/minecraft/class_3443; + ARG 1 start + ARG 2 pieces + ARG 3 random + ARG 4 heightOffset + ARG 5 leftRightOffset + METHOD method_14874 fillForwardOpening (Lnet/minecraft/class_3421$class_3434;Ljava/util/List;Ljava/util/Random;II)Lnet/minecraft/class_3443; + ARG 1 start + ARG 2 pieces + ARG 3 random + ARG 4 leftRightOffset + ARG 5 heightOffset CLASS class_3438 EntranceType CLASS class_3466 Turn diff --git a/mappings/net/minecraft/structure/StructurePiece.mapping b/mappings/net/minecraft/structure/StructurePiece.mapping index 43cc0786a9..d8947489f3 100644 --- a/mappings/net/minecraft/structure/StructurePiece.mapping +++ b/mappings/net/minecraft/structure/StructurePiece.mapping @@ -5,7 +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_15316 chainLength I FIELD field_16712 type Lnet/minecraft/class_3773; METHOD (Lnet/minecraft/class_3773;I)V ARG 1 type @@ -20,13 +20,17 @@ CLASS net/minecraft/class_3443 net/minecraft/structure/StructurePiece ARG 5 y ARG 6 z ARG 7 lootTableId + METHOD method_14916 orientateChest (Lnet/minecraft/class_1922;Lnet/minecraft/class_2338;Lnet/minecraft/class_2680;)Lnet/minecraft/class_2680; METHOD method_14917 addBlock (Lnet/minecraft/class_5281;Lnet/minecraft/class_2680;IIILnet/minecraft/class_3341;)V ARG 2 block 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_5281;Lnet/minecraft/class_3341;IIIIIILnet/minecraft/class_2680;Z)V + METHOD method_14918 fillOpenings (Lnet/minecraft/class_3443;Ljava/util/List;Ljava/util/Random;)V + ARG 1 start + ARG 2 pieces + ARG 3 random + METHOD method_14919 fillHalfEllipsoid (Lnet/minecraft/class_5281;Lnet/minecraft/class_3341;IIIIIILnet/minecraft/class_2680;Z)V ARG 2 bounds ARG 3 minX ARG 4 minY @@ -35,6 +39,7 @@ CLASS net/minecraft/class_3443 net/minecraft/structure/StructurePiece ARG 7 maxY ARG 8 maxZ ARG 9 block + ARG 10 cantReplaceAir METHOD method_14921 addChest (Lnet/minecraft/class_5425;Lnet/minecraft/class_3341;Ljava/util/Random;Lnet/minecraft/class_2338;Lnet/minecraft/class_2960;Lnet/minecraft/class_2680;)Z ARG 2 boundingBox ARG 3 random @@ -45,11 +50,14 @@ 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_14923 getChainLength ()I METHOD method_14924 applyYTransform (I)I + ARG 1 y METHOD method_14926 setOrientation (Lnet/minecraft/class_2350;)V ARG 1 orientation METHOD method_14928 applyXTransform (II)I + ARG 1 x + ARG 2 z METHOD method_14929 getBlockAt (Lnet/minecraft/class_1922;IIILnet/minecraft/class_3341;)Lnet/minecraft/class_2680; ARG 2 x ARG 3 y @@ -68,14 +76,27 @@ CLASS net/minecraft/class_3443 net/minecraft/structure/StructurePiece ARG 4 random ARG 5 boundingBox METHOD method_14932 getOverlappingPiece (Ljava/util/List;Lnet/minecraft/class_3341;)Lnet/minecraft/class_3443; + ARG 0 pieces METHOD method_14933 fillWithOutlineUnderSeaLevel (Lnet/minecraft/class_5281;Lnet/minecraft/class_3341;Ljava/util/Random;FIIIIIILnet/minecraft/class_2680;Lnet/minecraft/class_2680;ZZ)V ARG 3 random + ARG 4 blockChance + ARG 5 minX + ARG 6 minY + ARG 7 minZ + ARG 8 maxX + ARG 9 maxY + ARG 10 maxZ + ARG 11 outline + ARG 12 inside + ARG 13 cantReplaceAir + ARG 14 stayBelowSeaLevel METHOD method_14934 getFacing ()Lnet/minecraft/class_2350; METHOD method_14935 getBoundingBox ()Lnet/minecraft/class_3341; - METHOD method_14936 (Lnet/minecraft/class_5281;Lnet/minecraft/class_2680;IIILnet/minecraft/class_3341;)V + METHOD method_14936 fillDownwards (Lnet/minecraft/class_5281;Lnet/minecraft/class_2680;IIILnet/minecraft/class_3341;)V ARG 3 x ARG 4 y ARG 5 z + METHOD method_14937 isTouchingLiquid (Lnet/minecraft/class_1922;Lnet/minecraft/class_3341;)Z METHOD method_14938 fillWithOutline (Lnet/minecraft/class_5281;Lnet/minecraft/class_3341;IIIIIIZLjava/util/Random;Lnet/minecraft/class_3443$class_3444;)V ARG 3 minX ARG 4 minY @@ -83,15 +104,25 @@ CLASS net/minecraft/class_3443 net/minecraft/structure/StructurePiece ARG 6 maxX ARG 7 maxY ARG 8 maxZ - ARG 9 replaceBlocks + ARG 9 cantReplaceAir ARG 10 random METHOD method_14939 isUnderSeaLevel (Lnet/minecraft/class_4538;IIILnet/minecraft/class_3341;)Z ARG 2 x ARG 3 z ARG 4 y METHOD method_14940 fillWithOutline (Lnet/minecraft/class_5281;Lnet/minecraft/class_3341;IIIIIILnet/minecraft/class_2680;Lnet/minecraft/class_2680;Z)V + ARG 3 minX + ARG 4 minY + ARG 5 minZ + ARG 6 maxX + ARG 7 maxY + ARG 8 maxZ + ARG 9 outline ARG 10 inside + ARG 11 cantReplaceAir METHOD method_14941 applyZTransform (II)I + ARG 1 x + ARG 2 z METHOD method_14942 fill (Lnet/minecraft/class_5281;Lnet/minecraft/class_3341;IIIIII)V ARG 2 bounds ARG 3 minX @@ -99,6 +130,7 @@ CLASS net/minecraft/class_3443 net/minecraft/structure/StructurePiece ARG 5 minZ ARG 6 maxX ARG 7 maxY + ARG 8 maxZ METHOD method_14943 toNbt (Lnet/minecraft/class_2487;)V ARG 1 tag METHOD method_14945 addBlockWithRandomThreshold (Lnet/minecraft/class_5281;Lnet/minecraft/class_3341;Ljava/util/Random;FIIILnet/minecraft/class_2680;)V diff --git a/mappings/net/minecraft/structure/StructureStart.mapping b/mappings/net/minecraft/structure/StructureStart.mapping index efbd38d945..bf82d849a4 100644 --- a/mappings/net/minecraft/structure/StructureStart.mapping +++ b/mappings/net/minecraft/structure/StructureStart.mapping @@ -42,6 +42,14 @@ CLASS net/minecraft/class_3449 net/minecraft/structure/StructureStart ARG 4 random ARG 5 box ARG 6 chunkPos + METHOD method_14976 randomUpwardTranslation (Ljava/util/Random;II)V + ARG 1 random + ARG 2 minY + ARG 3 maxY + METHOD method_14978 randomUpwardTranslation (ILjava/util/Random;I)V + ARG 1 seaLevel + ARG 2 random + ARG 3 minSeaLevelDistance METHOD method_14979 isInExistingChunk ()Z METHOD method_16655 init (Lnet/minecraft/class_5455;Lnet/minecraft/class_2794;Lnet/minecraft/class_3485;IILnet/minecraft/class_1959;Lnet/minecraft/class_3037;)V ARG 1 registryManager