From 50205d62f90aa85c238a7cf1fb31912d403d37e1 Mon Sep 17 00:00:00 2001 From: NeunEinser Date: Sat, 20 Apr 2019 13:20:33 +0200 Subject: [PATCH] structure mappings (#640) --- .../structure/BuriedTreasureGenerator.mapping | 1 + .../structure/DesertTempleGenerator.mapping | 7 +++ .../structure/EndCityGenerator.mapping | 37 ++++++++++++++- .../structure/IglooGenerator.mapping | 18 +++++++ .../structure/JungleTempleGenerator.mapping | 10 +++- .../structure/NetherFortressGenerator.mapping | 26 ++++++++++ .../structure/OceanMonumentGenerator.mapping | 15 ++++++ ...tor.mapping => OceanRuinGenerator.mapping} | 28 ++++++++++- .../PillagerOutpostGenerator.mapping | 10 ++++ .../structure/PoolStructurePiece.mapping | 10 ++++ .../structure/ShipwreckGenerator.mapping | 13 ++++- .../structure/StrongholdGenerator.mapping | 43 ++++++++++++++--- .../net/minecraft/structure/Structure.mapping | 1 + .../structure/StructureFeatures.mapping | 2 + .../structure/StructureManager.mapping | 3 ++ .../structure/StructurePiece.mapping | 23 +++++++-- .../structure/StructurePieceType.mapping | 37 ++++++++++++++- .../StructurePieceWithDimensions.mapping | 2 + .../WoodlandMansionGenerator.mapping | 47 +++++++++++++++++++ 19 files changed, 316 insertions(+), 17 deletions(-) rename mappings/net/minecraft/structure/{OceanTempleGenerator.mapping => OceanRuinGenerator.mapping} (60%) diff --git a/mappings/net/minecraft/structure/BuriedTreasureGenerator.mapping b/mappings/net/minecraft/structure/BuriedTreasureGenerator.mapping index 1562baf791..4d749c7245 100644 --- a/mappings/net/minecraft/structure/BuriedTreasureGenerator.mapping +++ b/mappings/net/minecraft/structure/BuriedTreasureGenerator.mapping @@ -1,6 +1,7 @@ CLASS chs net/minecraft/structure/BuriedTreasureGenerator CLASS chs$a Piece METHOD (Lcje;Lib;)V + ARG 1 manager ARG 2 tag METHOD (Lev;)V ARG 1 pos diff --git a/mappings/net/minecraft/structure/DesertTempleGenerator.mapping b/mappings/net/minecraft/structure/DesertTempleGenerator.mapping index b926f28792..889e8eda0d 100644 --- a/mappings/net/minecraft/structure/DesertTempleGenerator.mapping +++ b/mappings/net/minecraft/structure/DesertTempleGenerator.mapping @@ -1,2 +1,9 @@ CLASS cht net/minecraft/structure/DesertTempleGenerator FIELD e hasPlacedChest [Z + METHOD (Lcje;Lib;)V + ARG 1 manager + ARG 2 tag + METHOD (Ljava/util/Random;II)V + ARG 1 random + ARG 2 x + ARG 3 z diff --git a/mappings/net/minecraft/structure/EndCityGenerator.mapping b/mappings/net/minecraft/structure/EndCityGenerator.mapping index d660741cf5..aaf4b16fef 100644 --- a/mappings/net/minecraft/structure/EndCityGenerator.mapping +++ b/mappings/net/minecraft/structure/EndCityGenerator.mapping @@ -1,12 +1,38 @@ CLASS chu net/minecraft/structure/EndCityGenerator + CLASS chu$3 + FIELD a shipGenerated Z CLASS chu$a Piece FIELD d template Ljava/lang/String; FIELD e rotation Lbqw; + FIELD f ignoreAir Z + METHOD (Lcje;Lib;)V + ARG 1 manager + ARG 2 tag METHOD (Lcje;Ljava/lang/String;Lev;Lbqw;Z)V - ARG 1 structureManager + ARG 1 manager ARG 2 template ARG 3 pos ARG 4 rotation + ARG 5 ignoreAir + METHOD a initializeStructureData (Lcje;)V + ARG 1 manager + CLASS chu$b Part + METHOD a init ()V + METHOD a create (Lcje;ILchu$a;Lev;Ljava/util/List;Ljava/util/Random;)Z + ARG 1 manager + ARG 2 depth + ARG 3 root + ARG 4 pos + ARG 5 pieces + ARG 6 random + FIELD a PLACEMENT_DATA Lcjf; + FIELD b IGNORE_AIR_PLACEMENT_DATA Lcjf; + FIELD c BUILDING Lchu$b; + FIELD d SMALL_TOWER_BRIDGE_ATTACHMENTS Ljava/util/List; + FIELD e SMALL_TOWER Lchu$b; + FIELD f BRIDGE_PIECE Lchu$b; + FIELD g FAT_TOWER_BRIDGE_ATTACHMENTS Ljava/util/List; + FIELD h FAT_TOWER Lchu$b; METHOD a addPieces (Lcje;Lev;Lbqw;Ljava/util/List;Ljava/util/Random;)V ARG 0 structureManager ARG 1 pos @@ -19,6 +45,15 @@ CLASS chu net/minecraft/structure/EndCityGenerator ARG 2 relativePosition ARG 3 template ARG 4 rotation + ARG 5 ignoreAir + METHOD b createPart (Lcje;Lchu$b;ILchu$a;Lev;Ljava/util/List;Ljava/util/Random;)Z + ARG 0 manager + ARG 1 piece + ARG 2 depth + ARG 3 parent + ARG 4 pos + ARG 5 pieces + ARG 6 random METHOD b addPiece (Ljava/util/List;Lchu$a;)Lchu$a; ARG 0 pieces ARG 1 piece diff --git a/mappings/net/minecraft/structure/IglooGenerator.mapping b/mappings/net/minecraft/structure/IglooGenerator.mapping index b7a50db3da..ecd1f061c2 100644 --- a/mappings/net/minecraft/structure/IglooGenerator.mapping +++ b/mappings/net/minecraft/structure/IglooGenerator.mapping @@ -2,6 +2,24 @@ CLASS chv net/minecraft/structure/IglooGenerator CLASS chv$a Piece FIELD d template Lqs; FIELD e rotation Lbqw; + METHOD (Lcje;Lib;)V + ARG 1 manager + ARG 2 tag + METHOD (Lcje;Lqs;Lev;Lbqw;I)V + ARG 1 manager + ARG 2 identifier + ARG 3 pos + ARG 4 rotation + ARG 5 yOffset + METHOD a initializeStructureData (Lcje;)V + ARG 1 manager FIELD a TOP_TEMPLATE Lqs; FIELD b MIDDLE_TEMPLATE Lqs; FIELD c BOTTOM_TEMPLATE Lqs; + METHOD a addPieces (Lcje;Lev;Lbqw;Ljava/util/List;Ljava/util/Random;Lccs;)V + ARG 0 manager + ARG 1 pos + ARG 2 rotation + ARG 3 pieces + ARG 4 random + ARG 5 defaultConfig diff --git a/mappings/net/minecraft/structure/JungleTempleGenerator.mapping b/mappings/net/minecraft/structure/JungleTempleGenerator.mapping index e0db92af70..3f451523ad 100644 --- a/mappings/net/minecraft/structure/JungleTempleGenerator.mapping +++ b/mappings/net/minecraft/structure/JungleTempleGenerator.mapping @@ -1,5 +1,5 @@ CLASS chw net/minecraft/structure/JungleTempleGenerator - CLASS chw$a + CLASS chw$a CobblestoneRandomizer METHOD a (Ljava/util/Random;IIIZ)V ARG 1 random ARG 2 x @@ -7,3 +7,11 @@ CLASS chw net/minecraft/structure/JungleTempleGenerator FIELD f placedHiddenChest Z FIELD g placedTrap1 Z FIELD h placedTrap2 Z + FIELD i COBBLESTONE_RANDOMIZER Lchw$a; + METHOD (Lcje;Lib;)V + ARG 1 manager + ARG 2 tag + METHOD (Ljava/util/Random;II)V + ARG 1 random + ARG 2 x + ARG 3 z diff --git a/mappings/net/minecraft/structure/NetherFortressGenerator.mapping b/mappings/net/minecraft/structure/NetherFortressGenerator.mapping index 06bd8eceff..3803998286 100644 --- a/mappings/net/minecraft/structure/NetherFortressGenerator.mapping +++ b/mappings/net/minecraft/structure/NetherFortressGenerator.mapping @@ -1,2 +1,28 @@ CLASS chz net/minecraft/structure/NetherFortressGenerator + CLASS chz$a BridgeCrossing + METHOD (Ljava/util/Random;II)V + ARG 1 random + ARG 2 x + ARG 3 z + CLASS chz$b BridgeEnd + FIELD a seed I + CLASS chz$c Bridge + CLASS chz$d CorridorStairs + CLASS chz$e CorridorBalcony + CLASS chz$f CorridorExit + CLASS chz$g CorridorCrossing + CLASS chz$h CorridorLeftTurn + FIELD a containsChest Z + CLASS chz$i SmallCorridor + CLASS chz$j CorridorRightTurn + FIELD a containsChest Z + CLASS chz$k CorridorNetherWartsRoom + CLASS chz$l BridgePlatform + FIELD a hasBlazeSpawner Z + CLASS chz$m Piece + CLASS chz$o BridgeSmallCrossing + CLASS chz$p BridgeStairs CLASS chz$q Start + FIELD b bridgePieces Ljava/util/List; + FIELD c corridorPieces Ljava/util/List; + METHOD b generatePiece (Lchz$n;Ljava/util/List;Ljava/util/Random;IIILfa;I)Lchz$m; diff --git a/mappings/net/minecraft/structure/OceanMonumentGenerator.mapping b/mappings/net/minecraft/structure/OceanMonumentGenerator.mapping index 1dda6cd4de..f636e53041 100644 --- a/mappings/net/minecraft/structure/OceanMonumentGenerator.mapping +++ b/mappings/net/minecraft/structure/OceanMonumentGenerator.mapping @@ -1,5 +1,20 @@ CLASS cia net/minecraft/structure/OceanMonumentGenerator + CLASS cia$h Base + CLASS cia$j CoreRoom + CLASS cia$k DoubleXRoom + CLASS cia$l DoubleXYRoom + CLASS cia$m DoubleYRoom + CLASS cia$n DoubleYZRoom + CLASS cia$o DoubleZRoom CLASS cia$p Entry CLASS cia$q Penthouse + CLASS cia$r + FIELD a PRISMARINE Lbvj; + FIELD b PRISMARINE_BRICKS Lbvj; + FIELD c DARK_PRISMARINE Lbvj; + FIELD e SEA_LANTERN Lbvj; + FIELD f WATER Lbvj; + FIELD g ICE_BLOCKS Ljava/util/Set; CLASS cia$s SimpleRoom CLASS cia$t SimpleRoomTop + CLASS cia$u WingRoom diff --git a/mappings/net/minecraft/structure/OceanTempleGenerator.mapping b/mappings/net/minecraft/structure/OceanRuinGenerator.mapping similarity index 60% rename from mappings/net/minecraft/structure/OceanTempleGenerator.mapping rename to mappings/net/minecraft/structure/OceanRuinGenerator.mapping index 366f480ef6..cdf1fb634f 100644 --- a/mappings/net/minecraft/structure/OceanTempleGenerator.mapping +++ b/mappings/net/minecraft/structure/OceanRuinGenerator.mapping @@ -1,10 +1,13 @@ -CLASS cic net/minecraft/structure/OceanTempleGenerator +CLASS cic net/minecraft/structure/OceanRuinGenerator CLASS cic$a Piece FIELD d biomeType Lcib$b; FIELD e integrity F FIELD f template Lqs; FIELD g rotation Lbqw; FIELD h large Z + METHOD (Lcje;Lib;)V + ARG 1 manager + ARG 2 tag METHOD (Lcje;Lqs;Lev;Lbqw;FLcib$b;Z)V ARG 1 structureManager ARG 2 template @@ -23,13 +26,34 @@ CLASS cic net/minecraft/structure/OceanTempleGenerator FIELD f BIG_MOSSY_RUINS [Lqs; FIELD g BIG_CRACKED_RUINS [Lqs; FIELD h BIG_WARM_RUINS [Lqs; - METHOD a (Lcje;Lev;Lbqw;Ljava/util/List;Ljava/util/Random;Lccu;ZF)V + METHOD a addPieces (Lcje;Lev;Lbqw;Ljava/util/List;Ljava/util/Random;Lccu;)V + ARG 0 manager ARG 1 pos ARG 2 rotation + ARG 3 pieces + ARG 4 random + ARG 5 config + METHOD a (Lcje;Lev;Lbqw;Ljava/util/List;Ljava/util/Random;Lccu;ZF)V + ARG 0 manager + ARG 1 pos + ARG 2 rotation + ARG 3 pieces + ARG 4 random ARG 5 config ARG 6 large ARG 7 integrity + METHOD a (Lcje;Ljava/util/Random;Lbqw;Lev;Lccu;Ljava/util/List;)V + ARG 0 manager + ARG 1 random + ARG 2 rotation + ARG 3 pos + ARG 4 config + ARG 5 pieces METHOD a getRandomWarmRuin (Ljava/util/Random;)Lqs; ARG 0 random + METHOD a getRoomPositions (Ljava/util/Random;II)Ljava/util/List; + ARG 0 random + ARG 1 x + ARG 2 z METHOD b getRandomBigWarmRuin (Ljava/util/Random;)Lqs; ARG 0 random diff --git a/mappings/net/minecraft/structure/PillagerOutpostGenerator.mapping b/mappings/net/minecraft/structure/PillagerOutpostGenerator.mapping index b2d612c1d5..7830bb230e 100644 --- a/mappings/net/minecraft/structure/PillagerOutpostGenerator.mapping +++ b/mappings/net/minecraft/structure/PillagerOutpostGenerator.mapping @@ -1,5 +1,15 @@ CLASS cid net/minecraft/structure/PillagerOutpostGenerator CLASS cid$a Piece + METHOD (Lcje;Lcfg;Lev;ILbqw;Lchr;)V + ARG 1 manager + ARG 2 element + ARG 3 pos + ARG 4 groundLevelDelta + ARG 5 rotation + ARG 6 boundingBox + METHOD (Lcje;Lib;)V + ARG 1 manager + ARG 2 tag METHOD a addPieces (Lbwy;Lcje;Lev;Ljava/util/List;Lbza;)V ARG 0 chunkGenerator ARG 1 structureManager diff --git a/mappings/net/minecraft/structure/PoolStructurePiece.mapping b/mappings/net/minecraft/structure/PoolStructurePiece.mapping index 97b2a41409..2b5496bd9a 100644 --- a/mappings/net/minecraft/structure/PoolStructurePiece.mapping +++ b/mappings/net/minecraft/structure/PoolStructurePiece.mapping @@ -6,7 +6,17 @@ CLASS cie net/minecraft/structure/PoolStructurePiece FIELD e junctions Ljava/util/List; FIELD f structureManager Lcje; METHOD (Lcek;Lcje;Lcfg;Lev;ILbqw;Lchr;)V + ARG 1 type + ARG 2 manager ARG 3 poolElement + ARG 4 pos + ARG 5 groundLevelDelta + ARG 6 rotation + ARG 7 boundingBox + METHOD (Lcje;Lib;Lcek;)V + ARG 1 manager + ARG 2 tag + ARG 3 type METHOD a addJunction (Lcfc;)V ARG 1 junction METHOD b getPoolElement ()Lcfg; diff --git a/mappings/net/minecraft/structure/ShipwreckGenerator.mapping b/mappings/net/minecraft/structure/ShipwreckGenerator.mapping index 9504f56639..eddaa98ab4 100644 --- a/mappings/net/minecraft/structure/ShipwreckGenerator.mapping +++ b/mappings/net/minecraft/structure/ShipwreckGenerator.mapping @@ -2,7 +2,18 @@ CLASS cig net/minecraft/structure/ShipwreckGenerator CLASS cig$a Piece FIELD d rotation Lbqw; FIELD e template Lqs; - FIELD f isBeached Z + FIELD f grounded Z + METHOD (Lcje;Lib;)V + ARG 1 manager + ARG 2 tag + METHOD (Lcje;Lqs;Lev;Lbqw;Z)V + ARG 1 manager + ARG 2 identifier + ARG 3 pos + ARG 4 rotation + ARG 5 grounded + METHOD a initializeStructureData (Lcje;)V + ARG 1 manager FIELD b BEACHED_TEMPLATES [Lqs; FIELD c REGULAR_TEMPLATES [Lqs; METHOD a addParts (Lcje;Lev;Lbqw;Ljava/util/List;Ljava/util/Random;Lcdt;)V diff --git a/mappings/net/minecraft/structure/StrongholdGenerator.mapping b/mappings/net/minecraft/structure/StrongholdGenerator.mapping index be1b1e3185..bfee35bf9e 100644 --- a/mappings/net/minecraft/structure/StrongholdGenerator.mapping +++ b/mappings/net/minecraft/structure/StrongholdGenerator.mapping @@ -1,14 +1,43 @@ CLASS cih net/minecraft/structure/StrongholdGenerator - CLASS cih$a Door + CLASS cih$a ChestCorridor + FIELD a chestGenerated Z + CLASS cih$b SmallCorridor + FIELD a length I CLASS cih$c FiveWayCrossing - FIELD a leftLow Z - FIELD b leftHigh Z - FIELD c rightLow Z - FIELD e rightHigh Z - CLASS cih$k + FIELD a lowerLeftExists Z + FIELD b upperLeftExists Z + FIELD c lowerRightExists Z + FIELD e upperRightExists Z + CLASS cih$d LeftTurn + CLASS cih$e Library + FIELD a tall Z + CLASS cih$g PortalRoom + FIELD a spawnerPlaced Z + CLASS cih$h PrisonHall + CLASS cih$i RightTurn + CLASS cih$j SquareRoom + FIELD a roomType I + CLASS cih$k StoneBrickRandomizer METHOD a (Ljava/util/Random;IIIZ)V ARG 1 random ARG 2 x + CLASS cih$l SpiralStaircase + FIELD a isStructureStart Z CLASS cih$m Start - CLASS cih$p + CLASS cih$n Corridor + FIELD a leftExitExists Z + FIELD b rightExitExixts Z + CLASS cih$o Stairs + CLASS cih$p Piece + CLASS cih$p$a EntranceType FIELD d entryDoor Lcih$p$a; + METHOD a generateEntrance (Lbhi;Ljava/util/Random;Lchr;Lcih$p$a;III)V + ARG 1 world + ARG 2 random + ARG 3 boundingBox + ARG 4 type + ARG 5 x + ARG 6 y + ARG 7 z + METHOD a getRandomEntrance (Ljava/util/Random;)Lcih$p$a; + ARG 1 random diff --git a/mappings/net/minecraft/structure/Structure.mapping b/mappings/net/minecraft/structure/Structure.mapping index 8b1cecf399..366209ba39 100644 --- a/mappings/net/minecraft/structure/Structure.mapping +++ b/mappings/net/minecraft/structure/Structure.mapping @@ -29,6 +29,7 @@ CLASS cji net/minecraft/structure/Structure METHOD a toTag (Lib;)Lib; ARG 1 tag METHOD a setAuthor (Ljava/lang/String;)V + ARG 1 name METHOD a createDoubleListTag ([D)Lii; METHOD a createIntListTag ([I)Lii; METHOD b getAuthor ()Ljava/lang/String; diff --git a/mappings/net/minecraft/structure/StructureFeatures.mapping b/mappings/net/minecraft/structure/StructureFeatures.mapping index d71a3b4a8f..2dde3f8988 100644 --- a/mappings/net/minecraft/structure/StructureFeatures.mapping +++ b/mappings/net/minecraft/structure/StructureFeatures.mapping @@ -22,3 +22,5 @@ CLASS cii net/minecraft/structure/StructureFeatures ARG 2 biomeSource ARG 3 tag METHOD a register (Ljava/lang/String;Lcej;)Lcej; + ARG 0 name + ARG 1 feature diff --git a/mappings/net/minecraft/structure/StructureManager.mapping b/mappings/net/minecraft/structure/StructureManager.mapping index 5e9bba3cc9..e0e2093b5f 100644 --- a/mappings/net/minecraft/structure/StructureManager.mapping +++ b/mappings/net/minecraft/structure/StructureManager.mapping @@ -5,7 +5,9 @@ CLASS cje net/minecraft/structure/StructureManager FIELD d server Lnet/minecraft/server/MinecraftServer; FIELD e generatedPath Ljava/nio/file/Path; METHOD (Lnet/minecraft/server/MinecraftServer;Ljava/io/File;Lcom/mojang/datafixers/DataFixer;)V + ARG 1 server ARG 2 worldDir + ARG 3 dataFixer METHOD a readStructure (Ljava/io/InputStream;)Lcji; ARG 1 structureInputStream METHOD a getStructureOrBlank (Lqs;)Lcji; @@ -14,6 +16,7 @@ CLASS cje net/minecraft/structure/StructureManager ARG 1 id ARG 2 string METHOD b getStructure (Lqs;)Lcji; + ARG 1 identifier METHOD b getAndCheckStructurePath (Lqs;Ljava/lang/String;)Ljava/nio/file/Path; ARG 1 id METHOD c saveStructure (Lqs;)Z diff --git a/mappings/net/minecraft/structure/StructurePiece.mapping b/mappings/net/minecraft/structure/StructurePiece.mapping index 540988d5e3..33d473722f 100644 --- a/mappings/net/minecraft/structure/StructurePiece.mapping +++ b/mappings/net/minecraft/structure/StructurePiece.mapping @@ -1,10 +1,13 @@ CLASS cik net/minecraft/structure/StructurePiece - CLASS cik$a + CLASS cik$a BlockRandomizer FIELD a block Lbvj; METHOD a getBlock ()Lbvj; - METHOD a (Ljava/util/Random;IIIZ)V + METHOD a setBlock (Ljava/util/Random;IIIZ)V ARG 1 random ARG 2 x + ARG 3 y + ARG 4 z + ARG 5 placeBlock FIELD a facing Lfa; FIELD b mirror Lbpw; FIELD c rotation Lbqw; @@ -15,6 +18,7 @@ CLASS cik net/minecraft/structure/StructurePiece METHOD (Lcek;I)V ARG 1 type METHOD (Lcek;Lib;)V + ARG 1 type ARG 2 tag METHOD Y_ getRotation ()Lbqw; METHOD a applyXTransform (II)I @@ -65,16 +69,29 @@ CLASS cik net/minecraft/structure/StructurePiece ARG 6 y ARG 7 z METHOD a addDispenser (Lbhi;Lchr;Ljava/util/Random;IIILfa;Lqs;)Z + ARG 1 world + ARG 2 boundingBox ARG 3 random ARG 4 x ARG 5 y ARG 6 z - METHOD a (Lbhi;Lchr;Ljava/util/Random;IIILqs;)Z + ARG 7 facing + ARG 8 lootTbaleId + METHOD a addChest (Lbhi;Lchr;Ljava/util/Random;IIILqs;)Z + ARG 1 world + ARG 2 boundingBox ARG 3 random + ARG 4 x + ARG 5 y + ARG 6 z + ARG 7 lootTableId METHOD a addChest (Lbhi;Lchr;Ljava/util/Random;Lev;Lqs;Lbvj;)Z ARG 1 world + ARG 2 boundingBox ARG 3 random ARG 4 pos + ARG 5 lootTableId + ARG 6 block METHOD a generate (Lbhi;Ljava/util/Random;Lchr;Lbgt;)Z ARG 1 world ARG 2 random diff --git a/mappings/net/minecraft/structure/StructurePieceType.mapping b/mappings/net/minecraft/structure/StructurePieceType.mapping index eb542859a5..725f3470af 100644 --- a/mappings/net/minecraft/structure/StructurePieceType.mapping +++ b/mappings/net/minecraft/structure/StructurePieceType.mapping @@ -1,14 +1,29 @@ CLASS cek net/minecraft/structure/StructurePieceType + FIELD A STRONGHOLD_PORTAL_ROOM Lcek; + FIELD B STRONGHOLD_PRISON_HALL Lcek; + FIELD C STRONGHOLD_RIGHT_TURN Lcek; + FIELD D STRONGHOLD_SQUARE_ROOM Lcek; + FIELD E STRONGHOLD_SPIRAL_STAIRCASE Lcek; FIELD F STRONGHOLD_START Lcek; + FIELD G STRONGHOLD_CORRIDOR Lcek; + FIELD H STRONGHOLD_STAIRS Lcek; FIELD I JUNGLE_TEMPLE Lcek; FIELD J OCEAN_TEMPLE Lcek; FIELD K IGLOO Lcek; FIELD L SWAMP_HUT Lcek; FIELD M DESERT_TEMPLE Lcek; - FIELD U OCEAN_MONUMENT_ENTRY Lcek; + FIELD N OCEAN_MONUMENT_BASE Lcek; + FIELD O OCEAN_MONUMENT_CORE_ROOM Lcek; + FIELD P OCEAN_MONUMENT_DOUBLE_X_ROOM Lcek; + FIELD Q OCEAN_MONUMENT_DOUBLE_X_Y_ROOM Lcek; + FIELD R OCEAN_MONUMENT_DOUBLE_Y_ROOM Lcek; + FIELD S OCEAN_MONUMENT_DOUBLE_Y_Z_ROOM Lcek; + FIELD T OCEAN_MONUMENT_DOUBLE_Z_ROOM Lcek; + FIELD U OCEAN_MONUMENT_ENTRY_ROOM Lcek; FIELD V OCEAN_MONUMENT_PENTHOUSE Lcek; FIELD W OCEAN_MONUMENT_SIMPLE_ROOM Lcek; - FIELD X OCEAN_MONUMENT_SIMPLE_ROOM_TOP Lcek; + FIELD X OCEAN_MONUMENT_SIMPLE_TOP_ROOM Lcek; + FIELD Y OCEAN_MONUMENT_WING_ROOM Lcek; FIELD Z END_CITY Lcek; FIELD a MINESHAFT_CORRIDOR Lcek; FIELD aa WOODLAND_MANSION Lcek; @@ -19,8 +34,26 @@ CLASS cek net/minecraft/structure/StructurePieceType FIELD d MINESHAFT_STAIRS Lcek; FIELD e PILLAGER_OUTPOST Lcek; FIELD f VILLAGE Lcek; + FIELD g NETHER_FORTRESS_BRIDGE_CROSSING Lcek; + FIELD h NETHER_FORTRESS_BRIDGE_END Lcek; + FIELD i NETHER_FORTRESS_BRIDGE Lcek; + FIELD j NETHER_FORTRESS_CORRIDOR_STAIRS Lcek; + FIELD k NETHER_FORTRESS_CORRIDOR_BALCONY Lcek; + FIELD l NETHER_FORTRESS_CORRIDOR_EXIT Lcek; + FIELD m NETHER_FORTRESS_CORRIDOR_CROSSING Lcek; + FIELD n NETHER_FORTRESS_CORRIDOR_LEFT_TURN Lcek; + FIELD o NETHER_FORTRESS_SMALL_CORRIDOR Lcek; + FIELD p NETHER_FORTRESS_CORRIDOR_RIGHT_TURN Lcek; + FIELD q NETHER_FORTRESS_CORRIDOR_NETHER_WARTS_ROOM Lcek; + FIELD r NETHER_FORTRESS_BRIDGE_PLATFORM Lcek; + FIELD s NETHER_FORTRESS_BRIDGE_SMALL_CROSSING Lcek; + FIELD t NETHER_FORTRESS_BRIDGE_STAIRS Lcek; FIELD u NETHER_FORTRESS_START Lcek; + FIELD v STRONGHOLD_CHEST_CORRIDOR Lcek; + FIELD w STRONGHOLD_SMALL_CORRIDOR Lcek; FIELD x STRONGHOLD_FIVE_WAY_CROSSING Lcek; + FIELD y STRONGHOLD_LEFT_TURN Lcek; + FIELD z STRONGJOLD_LIBRARY Lcek; METHOD a register (Lcek;Ljava/lang/String;)Lcek; ARG 0 pieceType ARG 1 id diff --git a/mappings/net/minecraft/structure/StructurePieceWithDimensions.mapping b/mappings/net/minecraft/structure/StructurePieceWithDimensions.mapping index ed5e2be9c2..cd01ff5c55 100644 --- a/mappings/net/minecraft/structure/StructurePieceWithDimensions.mapping +++ b/mappings/net/minecraft/structure/StructurePieceWithDimensions.mapping @@ -4,6 +4,8 @@ CLASS cif net/minecraft/structure/StructurePieceWithDimensions FIELD c depth I FIELD d hPos I METHOD (Lcek;Ljava/util/Random;IIIIII)V + ARG 1 type + ARG 2 random ARG 3 x ARG 4 y ARG 5 z diff --git a/mappings/net/minecraft/structure/WoodlandMansionGenerator.mapping b/mappings/net/minecraft/structure/WoodlandMansionGenerator.mapping index 3da8c69715..5b439331c0 100644 --- a/mappings/net/minecraft/structure/WoodlandMansionGenerator.mapping +++ b/mappings/net/minecraft/structure/WoodlandMansionGenerator.mapping @@ -1,5 +1,52 @@ CLASS cio net/minecraft/structure/WoodlandMansionGenerator + CLASS cio$a FirstFloorRoomPool + CLASS cio$b RoomPool + METHOD a getSmallRoom (Ljava/util/Random;)Ljava/lang/String; + ARG 1 random + METHOD a getMediumFunctionalRoom (Ljava/util/Random;Z)Ljava/lang/String; + ARG 1 random + ARG 2 staircase + METHOD b getSmallSecretRoom (Ljava/util/Random;)Ljava/lang/String; + ARG 1 random + METHOD b getMediumGenericRoom (Ljava/util/Random;Z)Ljava/lang/String; + ARG 1 random + ARG 2 staircase + METHOD c getMediumSecretRoom (Ljava/util/Random;)Ljava/lang/String; + ARG 1 random + METHOD d getBigRoom (Ljava/util/Random;)Ljava/lang/String; + ARG 1 random + METHOD e getBigSecretRoom (Ljava/util/Random;)Ljava/lang/String; + ARG 1 random + CLASS cio$d LayoutGenerator + FIELD a manager Lcje; + FIELD b random Ljava/util/Random; + METHOD (Lcje;Ljava/util/Random;)V + ARG 1 manager + ARG 2 random + METHOD a generate (Lev;Lbqw;Ljava/util/List;Lcio$c;)V + ARG 1 pos + ARG 2 rotation + ARG 3 pieces + METHOD a addEntrance (Ljava/util/List;Lcio$e;)V + METHOD a addRoof (Ljava/util/List;Lcio$e;Lcio$g;Lfa;IIII)V + METHOD a addBigSecretRoom (Ljava/util/List;Lev;Lbqw;Lcio$b;)V + METHOD a addSmallRoom (Ljava/util/List;Lev;Lbqw;Lfa;Lcio$b;)V + METHOD a addBigRoom (Ljava/util/List;Lev;Lbqw;Lfa;Lfa;Lcio$b;)V + METHOD a addMediumRoom (Ljava/util/List;Lev;Lbqw;Lfa;Lfa;Lcio$b;Z)V + ARG 7 staircase + CLASS cio$e GenerationPiece + FIELD a rotation Lbqw; + FIELD b position Lev; + FIELD c template Ljava/lang/String; + CLASS cio$f SecondFloorRoomPool + CLASS cio$h ThirdFloorRoomPool CLASS cio$i Piece FIELD d template Ljava/lang/String; FIELD e rotation Lbqw; FIELD f mirror Lbpw; + METHOD a addPieces (Lcje;Lev;Lbqw;Ljava/util/List;Ljava/util/Random;)V + ARG 0 manager + ARG 1 pos + ARG 2 rotation + ARG 3 pieces + ARG 4 random