diff --git a/mappings/bsx.mapping b/mappings/bsx.mapping new file mode 100644 index 0000000000..54d0cbe4f7 --- /dev/null +++ b/mappings/bsx.mapping @@ -0,0 +1,11 @@ +CLASS bsx + FIELD a featureUpdater Lccu; + FIELD c dataFixer Lcom/mojang/datafixers/DataFixer; + METHOD (Lcom/mojang/datafixers/DataFixer;)V + ARG 1 dataFixer + METHOD a updateChunkTag (Lbtd;Ljava/util/function/Supplier;Lhr;)Lhr; + ARG 1 dimensionType + ARG 2 dimensionalPersistentStateManagerFactory + ARG 3 tag + METHOD a getDataVersion (Lhr;)I + ARG 0 tag diff --git a/mappings/cac.mapping b/mappings/cac.mapping deleted file mode 100644 index 34847fbfae..0000000000 --- a/mappings/cac.mapping +++ /dev/null @@ -1,2 +0,0 @@ -CLASS cac - FIELD a elements Ljava/util/List; diff --git a/mappings/cag.mapping b/mappings/cag.mapping deleted file mode 100644 index d8bd565ed6..0000000000 --- a/mappings/cag.mapping +++ /dev/null @@ -1,4 +0,0 @@ -CLASS cag - CLASS cag$a Projection - FIELD a TERRAIN_MATCHING Lcag$a; - FIELD b RIGID Lcag$a; diff --git a/mappings/ccp.mapping b/mappings/ccp.mapping deleted file mode 100644 index b060a8eb32..0000000000 --- a/mappings/ccp.mapping +++ /dev/null @@ -1,4 +0,0 @@ -CLASS ccp - CLASS ccp$a - METHOD a (Lbcm;Ljava/util/Random;Lcco;Lbby;)Z - ARG 2 random diff --git a/mappings/cdb.mapping b/mappings/cdb.mapping deleted file mode 100644 index b9d648fe8a..0000000000 --- a/mappings/cdb.mapping +++ /dev/null @@ -1,3 +0,0 @@ -CLASS cdb - METHOD a (Lbcm;Ljava/util/Random;Lcco;Lbby;)Z - ARG 2 random diff --git a/mappings/cdk.mapping b/mappings/cdk.mapping deleted file mode 100644 index 3ce9c8ede2..0000000000 --- a/mappings/cdk.mapping +++ /dev/null @@ -1,3 +0,0 @@ -CLASS cdk - METHOD a (Lbcm;Ljava/util/Random;Lcco;Lbby;)Z - ARG 2 random diff --git a/mappings/net/minecraft/server/network/ServerPlayerEntity.mapping b/mappings/net/minecraft/server/network/ServerPlayerEntity.mapping index d7901e88d1..8f9a186617 100644 --- a/mappings/net/minecraft/server/network/ServerPlayerEntity.mapping +++ b/mappings/net/minecraft/server/network/ServerPlayerEntity.mapping @@ -4,7 +4,7 @@ CLASS ut net/minecraft/server/network/ServerPlayerEntity FIELD cB chunkPos Lbby; FIELD cC containerSyncId I FIELD c server Lnet/minecraft/server/MinecraftServer; - FIELD ca LOGGER_PLAYER Lorg/apache/logging/log4j/Logger; + FIELD ca LOGGER Lorg/apache/logging/log4j/Logger; FIELD cb clientLanguage Ljava/lang/String; FIELD cd advancementManager Lqn; FIELD cq clientChatVisibility Larj$b; @@ -21,11 +21,13 @@ CLASS ut net/minecraft/server/network/ServerPlayerEntity METHOD L getAdvancementManager ()Lqn; METHOD M getEnteredNetherPosition ()Lcmr; METHOD O getChunkPos ()Lbby; - METHOD a sendRemoveChunkPacket (Lbby;)V + METHOD a sendUnloadChunkPacket (Lbby;)V METHOD a sendInitialChunkPackets (Lbby;Ljq;Ljq;)V METHOD a sendBlockEntityUpdate (Lboo;)V METHOD a sendChatMessage (Ljc;Lja;)V METHOD a setClientSettings (Lnj;)V + METHOD b setChunkPos (Lbby;)V + ARG 1 chunkPos METHOD d onStartedTracking (Lahc;)V METHOD dT incrementContainerSyncId ()V METHOD s getServerWorld ()Lur; diff --git a/mappings/net/minecraft/server/network/packet/UpdateJigsawServerPacket.mapping b/mappings/net/minecraft/server/network/packet/UpdateJigsawServerPacket.mapping index e5d0242c6e..2384102dec 100644 --- a/mappings/net/minecraft/server/network/packet/UpdateJigsawServerPacket.mapping +++ b/mappings/net/minecraft/server/network/packet/UpdateJigsawServerPacket.mapping @@ -1,2 +1,14 @@ CLASS on net/minecraft/server/network/packet/UpdateJigsawServerPacket FIELD a pos Let; + FIELD b attachmentType Lqd; + FIELD c targetPool Lqd; + FIELD d finalState Ljava/lang/String; + METHOD (Let;Lqd;Lqd;Ljava/lang/String;)V + ARG 1 pos + ARG 2 attachmentType + ARG 3 targetPool + ARG 4 finalState + METHOD b getPos ()Let; + METHOD c getTargetPool ()Lqd; + METHOD d getAttachmentType ()Lqd; + METHOD e getFinalState ()Ljava/lang/String; diff --git a/mappings/net/minecraft/server/world/ChunkHolder.mapping b/mappings/net/minecraft/server/world/ChunkHolder.mapping index 193001eaec..d07f35550f 100644 --- a/mappings/net/minecraft/server/world/ChunkHolder.mapping +++ b/mappings/net/minecraft/server/world/ChunkHolder.mapping @@ -52,13 +52,13 @@ CLASS ue net/minecraft/server/world/ChunkHolder ARG 1 status METHOD a getChunk (Lbsd;Luf;)Ljava/util/concurrent/CompletableFuture; ARG 1 status - ARG 2 chunkHolderManager + ARG 2 chunkStorage METHOD a flushUpdates (Lbsk;)V METHOD a updateChunk (Ljava/util/concurrent/CompletableFuture;)V METHOD a sendPacketToPlayersWatching (Ljq;Z)V ARG 2 onlyOnWatchDistanceEdge METHOD a update (Luf;)V - ARG 1 chunkHolderManager + ARG 1 chunkStorage METHOD b getTargetGenerationStatus (I)Lbsd; ARG 0 level METHOD b getChunkMinimumStatus (Lbsd;)Ljava/util/concurrent/CompletableFuture; diff --git a/mappings/net/minecraft/server/world/ChunkTicketManager.mapping b/mappings/net/minecraft/server/world/ChunkTicketManager.mapping index 7322db7b71..3a39b8fbaa 100644 --- a/mappings/net/minecraft/server/world/ChunkTicketManager.mapping +++ b/mappings/net/minecraft/server/world/ChunkTicketManager.mapping @@ -33,11 +33,13 @@ CLASS ul net/minecraft/server/world/ChunkTicketManager METHOD a getLevel (Lit/unimi/dsi/fastutil/objects/ObjectSortedSet;)I ARG 1 ticketSet METHOD a update (Luf;)Z + ARG 1 chunkStorage METHOD a addTicketWithLevel (Lux;Lbby;ILjava/lang/Object;)V ARG 1 type ARG 2 pos ARG 3 level ARG 4 argument + METHOD b getLevelCount ()I METHOD b getChunkHolder (J)Lue; ARG 1 pos METHOD b removeTicket (JLuw;)V diff --git a/mappings/net/minecraft/server/world/ServerChunkManager.mapping b/mappings/net/minecraft/server/world/ServerChunkManager.mapping index 035db6cacc..fcd362ea23 100644 --- a/mappings/net/minecraft/server/world/ServerChunkManager.mapping +++ b/mappings/net/minecraft/server/world/ServerChunkManager.mapping @@ -9,7 +9,8 @@ CLASS uq net/minecraft/server/world/ServerChunkManager FIELD h lightProvider Luv; FIELD i genQueue Ljava/util/Queue; FIELD j players Luo; - FIELD k chunkHolderManager Luf; + FIELD k threadedAnvilChunkStorage Luf; + FIELD l dimensionalPersistentStateManager Lciw; FIELD m maxWatchDistance I FIELD n lastMobSpawningTime J FIELD o spawnMonsters Z @@ -28,10 +29,12 @@ CLASS uq net/minecraft/server/world/ServerChunkManager ARG 1 player METHOD a markForUpdate (Let;)V METHOD a addPlayer (Lut;)V + ARG 1 player METHOD a (Lut;II)Z ARG 2 x ARG 3 z METHOD a addOrRemovePlayer (Lut;Z)V + ARG 1 player ARG 2 add METHOD a addTicket (Lux;Lbby;ILjava/lang/Object;)V METHOD a save (Z)V @@ -44,6 +47,7 @@ CLASS uq net/minecraft/server/world/ServerChunkManager ARG 4 create METHOD b getSqDistance (Lbby;Lahc;)D METHOD b removePlayer (Lut;)V + ARG 1 player METHOD b removeTicket (Lux;Lbby;ILjava/lang/Object;)V METHOD c getWorld ()Lbcl; METHOD c getChunkAsync (IILbsd;Z)Ljava/util/concurrent/CompletableFuture; @@ -53,7 +57,9 @@ CLASS uq net/minecraft/server/world/ServerChunkManager ARG 4 create METHOD c updateChunkWatchingForPlayer (Lut;)V ARG 1 playerEntity - METHOD d isWatchDisabled (Lut;)Z + METHOD d doesNotGenerateChunks (Lut;)Z + ARG 1 player METHOD g getLoadedChunkCount ()I + METHOD h getDimensionalPersistentStateManager ()Lciw; METHOD k update ()Z METHOD l doMobSpawning ()V diff --git a/mappings/net/minecraft/server/world/ServerWorld.mapping b/mappings/net/minecraft/server/world/ServerWorld.mapping index 4bc23f6b1c..32ae7d7798 100644 --- a/mappings/net/minecraft/server/world/ServerWorld.mapping +++ b/mappings/net/minecraft/server/world/ServerWorld.mapping @@ -10,6 +10,7 @@ CLASS ur net/minecraft/server/world/ServerWorld FIELD z LOGGER Lorg/apache/logging/log4j/Logger; METHOD (Lnet/minecraft/server/MinecraftServer;Ljava/util/concurrent/Executor;Lciy;Lcix;Lbtd;Lafc;Lvc;)V ARG 1 server + METHOD B getDimensionalPersistentStateManager ()Lciw; METHOD a init (Lbcq;)V ARG 1 levelInfo METHOD a save (Lzc;ZZ)V diff --git a/mappings/net/minecraft/server/world/ChunkHolderManager.mapping b/mappings/net/minecraft/server/world/ThreadedAnvilChunkStorage.mapping similarity index 75% rename from mappings/net/minecraft/server/world/ChunkHolderManager.mapping rename to mappings/net/minecraft/server/world/ThreadedAnvilChunkStorage.mapping index e1126df683..6540b558b2 100644 --- a/mappings/net/minecraft/server/world/ChunkHolderManager.mapping +++ b/mappings/net/minecraft/server/world/ThreadedAnvilChunkStorage.mapping @@ -1,4 +1,4 @@ -CLASS uf net/minecraft/server/world/ChunkHolderManager +CLASS uf net/minecraft/server/world/ThreadedAnvilChunkStorage CLASS uf$a TicketManager METHOD (Luf;Ljava/util/concurrent/Executor;Ljava/util/concurrent/Executor;)V ARG 1 executor @@ -9,15 +9,21 @@ CLASS uf net/minecraft/server/world/ChunkHolderManager FIELD g genQueueAdder Ljava/util/concurrent/Executor; FIELD h playersWatchingChunkProvider Lue$d; FIELD i chunkGenerator Lbrz; + FIELD j dimensionalPersistentStateManagerFactory Ljava/util/function/Supplier; FIELD k posToHolderCopy Lit/unimi/dsi/fastutil/longs/Long2ObjectLinkedOpenHashMap; FIELD m posToHolderCopyOutdated Z FIELD n chunkTaskPrioritySystem Luh; FIELD o worldgenActor Lafg; FIELD p mainActor Lafg; + FIELD q worldGenerationProgressListener Lvc; FIELD r ticketManager Luf$a; FIELD s totalChunksLoadedCount Ljava/util/concurrent/atomic/AtomicInteger; + FIELD t structureManager Lceb; + FIELD u saveDir Ljava/io/File; METHOD a getLightProvider ()Luv; METHOD a applyViewDistance (II)V + ARG 1 maxWatchDistance + ARG 2 viewDistance METHOD a getChunkHolder (J)Lue; ARG 1 pos METHOD a setLevel (JILue;I)Lue; @@ -35,9 +41,15 @@ CLASS uf net/minecraft/server/world/ChunkHolderManager METHOD a getPrecedingTargetChunkGenerationStatus (Lbsd;I)Lbsd; ARG 2 distance METHOD a unload (Ljava/util/function/BooleanSupplier;)V - METHOD a generateChunk (Lue;Lbsd;)Ljava/util/concurrent/CompletableFuture; + METHOD a getChunk (Lue;Lbsd;)Ljava/util/concurrent/CompletableFuture; ARG 1 holder ARG 2 status + METHOD a sendWatchPackets (Lut;Lbby;[Ljq;ZZ)V + ARG 1 player + ARG 2 pos + ARG 3 packets + ARG 4 withinMaxWatchDistance + ARG 5 withinViewDistance METHOD a save (Z)V ARG 1 flush METHOD b updateHolderMap ()V @@ -45,5 +57,7 @@ CLASS uf net/minecraft/server/world/ChunkHolderManager ARG 1 pos METHOD c getTotalChunksLoadedCount ()I METHOD d getLoadedChunkCount ()I + METHOD d getUpdatedChunkTag (Lbby;)Lhr; + ARG 1 pos METHOD e getTicketManager ()Luf$a; METHOD f entryIterator ()Lit/unimi/dsi/fastutil/objects/ObjectBidirectionalIterator; diff --git a/mappings/net/minecraft/sortme/StructurePiece.mapping b/mappings/net/minecraft/sortme/StructurePiece.mapping deleted file mode 100644 index 814cee310a..0000000000 --- a/mappings/net/minecraft/sortme/StructurePiece.mapping +++ /dev/null @@ -1,2 +0,0 @@ -CLASS bzi net/minecraft/sortme/StructurePiece - METHOD a setPieceId (Lbzi;Ljava/lang/String;)Lbzi; diff --git a/mappings/net/minecraft/sortme/StructurePoolElement.mapping b/mappings/net/minecraft/sortme/StructurePoolElement.mapping deleted file mode 100644 index d18c37eb6d..0000000000 --- a/mappings/net/minecraft/sortme/StructurePoolElement.mapping +++ /dev/null @@ -1,2 +0,0 @@ -CLASS caf net/minecraft/sortme/StructurePoolElement - METHOD a register (Ljava/lang/String;Lcaf;)Lcaf; diff --git a/mappings/net/minecraft/sortme/structures/DesertTempleGenerator.mapping b/mappings/net/minecraft/sortme/structures/DesertTempleGenerator.mapping deleted file mode 100644 index e7bd31be83..0000000000 --- a/mappings/net/minecraft/sortme/structures/DesertTempleGenerator.mapping +++ /dev/null @@ -1,3 +0,0 @@ -CLASS ccq net/minecraft/sortme/structures/DesertTempleGenerator - METHOD a (Lbcm;Ljava/util/Random;Lcco;Lbby;)Z - ARG 2 random diff --git a/mappings/net/minecraft/sortme/structures/EndCityGenerator.mapping b/mappings/net/minecraft/sortme/structures/EndCityGenerator.mapping deleted file mode 100644 index 991cb76689..0000000000 --- a/mappings/net/minecraft/sortme/structures/EndCityGenerator.mapping +++ /dev/null @@ -1 +0,0 @@ -CLASS ccr net/minecraft/sortme/structures/EndCityGenerator diff --git a/mappings/net/minecraft/sortme/structures/IglooGenerator.mapping b/mappings/net/minecraft/sortme/structures/IglooGenerator.mapping deleted file mode 100644 index 6d693399fc..0000000000 --- a/mappings/net/minecraft/sortme/structures/IglooGenerator.mapping +++ /dev/null @@ -1,4 +0,0 @@ -CLASS ccs net/minecraft/sortme/structures/IglooGenerator - CLASS ccs$a - METHOD a (Lbcm;Ljava/util/Random;Lcco;Lbby;)Z - ARG 2 random diff --git a/mappings/net/minecraft/sortme/structures/JungleTempleGenerator.mapping b/mappings/net/minecraft/sortme/structures/JungleTempleGenerator.mapping deleted file mode 100644 index 8066e73bf5..0000000000 --- a/mappings/net/minecraft/sortme/structures/JungleTempleGenerator.mapping +++ /dev/null @@ -1,7 +0,0 @@ -CLASS cct net/minecraft/sortme/structures/JungleTempleGenerator - CLASS cct$a - METHOD a (Ljava/util/Random;IIIZ)V - ARG 1 random - ARG 2 x - METHOD a (Lbcm;Ljava/util/Random;Lcco;Lbby;)Z - ARG 2 random diff --git a/mappings/net/minecraft/sortme/structures/MansionGenerator.mapping b/mappings/net/minecraft/sortme/structures/MansionGenerator.mapping deleted file mode 100644 index bbc2640e11..0000000000 --- a/mappings/net/minecraft/sortme/structures/MansionGenerator.mapping +++ /dev/null @@ -1 +0,0 @@ -CLASS cdl net/minecraft/sortme/structures/MansionGenerator diff --git a/mappings/net/minecraft/sortme/structures/NetherFortressGenerator.mapping b/mappings/net/minecraft/sortme/structures/NetherFortressGenerator.mapping deleted file mode 100644 index 1790c63860..0000000000 --- a/mappings/net/minecraft/sortme/structures/NetherFortressGenerator.mapping +++ /dev/null @@ -1,43 +0,0 @@ -CLASS ccw net/minecraft/sortme/structures/NetherFortressGenerator - CLASS ccw$a - METHOD a (Lbcm;Ljava/util/Random;Lcco;Lbby;)Z - ARG 2 random - CLASS ccw$b - METHOD a (Lbcm;Ljava/util/Random;Lcco;Lbby;)Z - ARG 2 random - CLASS ccw$c - METHOD a (Lbcm;Ljava/util/Random;Lcco;Lbby;)Z - ARG 2 random - CLASS ccw$d - METHOD a (Lbcm;Ljava/util/Random;Lcco;Lbby;)Z - ARG 2 random - CLASS ccw$e - METHOD a (Lbcm;Ljava/util/Random;Lcco;Lbby;)Z - ARG 2 random - CLASS ccw$f - METHOD a (Lbcm;Ljava/util/Random;Lcco;Lbby;)Z - ARG 2 random - CLASS ccw$g - METHOD a (Lbcm;Ljava/util/Random;Lcco;Lbby;)Z - ARG 2 random - CLASS ccw$h - METHOD a (Lbcm;Ljava/util/Random;Lcco;Lbby;)Z - ARG 2 random - CLASS ccw$i - METHOD a (Lbcm;Ljava/util/Random;Lcco;Lbby;)Z - ARG 2 random - CLASS ccw$j - METHOD a (Lbcm;Ljava/util/Random;Lcco;Lbby;)Z - ARG 2 random - CLASS ccw$k - METHOD a (Lbcm;Ljava/util/Random;Lcco;Lbby;)Z - ARG 2 random - CLASS ccw$l - METHOD a (Lbcm;Ljava/util/Random;Lcco;Lbby;)Z - ARG 2 random - CLASS ccw$o - METHOD a (Lbcm;Ljava/util/Random;Lcco;Lbby;)Z - ARG 2 random - CLASS ccw$p - METHOD a (Lbcm;Ljava/util/Random;Lcco;Lbby;)Z - ARG 2 random diff --git a/mappings/net/minecraft/sortme/structures/OceanTempleGenerator.mapping b/mappings/net/minecraft/sortme/structures/OceanTempleGenerator.mapping deleted file mode 100644 index 5fda326e9a..0000000000 --- a/mappings/net/minecraft/sortme/structures/OceanTempleGenerator.mapping +++ /dev/null @@ -1,4 +0,0 @@ -CLASS ccz net/minecraft/sortme/structures/OceanTempleGenerator - CLASS ccz$a - METHOD a (Lbcm;Ljava/util/Random;Lcco;Lbby;)Z - ARG 2 random diff --git a/mappings/net/minecraft/sortme/structures/ShipwreckGenerator.mapping b/mappings/net/minecraft/sortme/structures/ShipwreckGenerator.mapping deleted file mode 100644 index ebad531695..0000000000 --- a/mappings/net/minecraft/sortme/structures/ShipwreckGenerator.mapping +++ /dev/null @@ -1,4 +0,0 @@ -CLASS cdd net/minecraft/sortme/structures/ShipwreckGenerator - CLASS cdd$a - METHOD a (Lbcm;Ljava/util/Random;Lcco;Lbby;)Z - ARG 2 random diff --git a/mappings/net/minecraft/sortme/structures/StrongholdGenerator.mapping b/mappings/net/minecraft/sortme/structures/StrongholdGenerator.mapping deleted file mode 100644 index a49ca75126..0000000000 --- a/mappings/net/minecraft/sortme/structures/StrongholdGenerator.mapping +++ /dev/null @@ -1,41 +0,0 @@ -CLASS cde net/minecraft/sortme/structures/StrongholdGenerator - CLASS cde$a - METHOD a (Lbcm;Ljava/util/Random;Lcco;Lbby;)Z - ARG 2 random - CLASS cde$b - METHOD a (Lbcm;Ljava/util/Random;Lcco;Lbby;)Z - ARG 2 random - CLASS cde$c - METHOD a (Lbcm;Ljava/util/Random;Lcco;Lbby;)Z - ARG 2 random - CLASS cde$d - METHOD a (Lbcm;Ljava/util/Random;Lcco;Lbby;)Z - ARG 2 random - CLASS cde$e - METHOD a (Lbcm;Ljava/util/Random;Lcco;Lbby;)Z - ARG 2 random - CLASS cde$g - METHOD a (Lbcm;Ljava/util/Random;Lcco;Lbby;)Z - ARG 2 random - CLASS cde$h - METHOD a (Lbcm;Ljava/util/Random;Lcco;Lbby;)Z - ARG 2 random - CLASS cde$i - METHOD a (Lbcm;Ljava/util/Random;Lcco;Lbby;)Z - ARG 2 random - CLASS cde$j - METHOD a (Lbcm;Ljava/util/Random;Lcco;Lbby;)Z - ARG 2 random - CLASS cde$k - METHOD a (Ljava/util/Random;IIIZ)V - ARG 1 random - ARG 2 x - CLASS cde$l - METHOD a (Lbcm;Ljava/util/Random;Lcco;Lbby;)Z - ARG 2 random - CLASS cde$n - METHOD a (Lbcm;Ljava/util/Random;Lcco;Lbby;)Z - ARG 2 random - CLASS cde$o - METHOD a (Lbcm;Ljava/util/Random;Lcco;Lbby;)Z - ARG 2 random diff --git a/mappings/net/minecraft/sortme/structures/StructureStart.mapping b/mappings/net/minecraft/sortme/structures/StructureStart.mapping deleted file mode 100644 index f147844adb..0000000000 --- a/mappings/net/minecraft/sortme/structures/StructureStart.mapping +++ /dev/null @@ -1,21 +0,0 @@ -CLASS cdi net/minecraft/sortme/structures/StructureStart - CLASS cdi$1 - METHOD (Lbzh;IILbdj;Lcco;IJ)V - ARG 2 chunkX - ARG 3 chunkZ - FIELD b children Ljava/util/List; - FIELD c boundingBox Lcco; - FIELD e feature Lbzh; - FIELD f chunkX I - FIELD g chunkZ I - FIELD h biome Lbdj; - FIELD i references I - METHOD (Lbzh;IILbdj;Lcco;IJ)V - ARG 2 chunkX - ARG 3 chunkZ - METHOD a toTag (II)Lhr; - ARG 1 chunkX - ARG 2 chunkZ - METHOD e hasChildren ()Z - METHOD i incrementReferences ()V - METHOD k getFeature ()Lbzh; diff --git a/mappings/net/minecraft/sortme/structures/processor/AbstractStructureProcessor.mapping b/mappings/net/minecraft/sortme/structures/processor/AbstractStructureProcessor.mapping deleted file mode 100644 index c54ddbb716..0000000000 --- a/mappings/net/minecraft/sortme/structures/processor/AbstractStructureProcessor.mapping +++ /dev/null @@ -1,3 +0,0 @@ -CLASS ced net/minecraft/sortme/structures/processor/AbstractStructureProcessor - METHOD a getStructureProcessor ()Lcee; - METHOD a process (Lbcp;Let;Lcef$b;Lcef$b;Lcec;)Lcef$b; diff --git a/mappings/net/minecraft/sortme/structures/processor/BlockIgnoreStructureProcessor.mapping b/mappings/net/minecraft/sortme/structures/processor/BlockIgnoreStructureProcessor.mapping deleted file mode 100644 index bc45c8f0b3..0000000000 --- a/mappings/net/minecraft/sortme/structures/processor/BlockIgnoreStructureProcessor.mapping +++ /dev/null @@ -1,2 +0,0 @@ -CLASS cdo net/minecraft/sortme/structures/processor/BlockIgnoreStructureProcessor - FIELD d blocks Lcom/google/common/collect/ImmutableList; diff --git a/mappings/net/minecraft/sortme/structures/processor/BlockRotStructureProcessor.mapping b/mappings/net/minecraft/sortme/structures/processor/BlockRotStructureProcessor.mapping deleted file mode 100644 index 446b4f49a7..0000000000 --- a/mappings/net/minecraft/sortme/structures/processor/BlockRotStructureProcessor.mapping +++ /dev/null @@ -1,4 +0,0 @@ -CLASS cdq net/minecraft/sortme/structures/processor/BlockRotStructureProcessor - FIELD a integrity F - METHOD (F)V - ARG 1 integrity diff --git a/mappings/net/minecraft/sortme/structures/processor/JigsawReplacementStructureProcessor.mapping b/mappings/net/minecraft/sortme/structures/processor/JigsawReplacementStructureProcessor.mapping deleted file mode 100644 index ad56fba05b..0000000000 --- a/mappings/net/minecraft/sortme/structures/processor/JigsawReplacementStructureProcessor.mapping +++ /dev/null @@ -1,2 +0,0 @@ -CLASS cdt net/minecraft/sortme/structures/processor/JigsawReplacementStructureProcessor - FIELD a INSTANCE Lcdt; diff --git a/mappings/net/minecraft/sortme/structures/processor/NopStructureProcessor.mapping b/mappings/net/minecraft/sortme/structures/processor/NopStructureProcessor.mapping deleted file mode 100644 index 231f73518f..0000000000 --- a/mappings/net/minecraft/sortme/structures/processor/NopStructureProcessor.mapping +++ /dev/null @@ -1,2 +0,0 @@ -CLASS cdu net/minecraft/sortme/structures/processor/NopStructureProcessor - FIELD a INSTANCE Lcdu; diff --git a/mappings/net/minecraft/sortme/structures/processor/RuleStructureProcessor.mapping b/mappings/net/minecraft/sortme/structures/processor/RuleStructureProcessor.mapping deleted file mode 100644 index 1cadf7869c..0000000000 --- a/mappings/net/minecraft/sortme/structures/processor/RuleStructureProcessor.mapping +++ /dev/null @@ -1,2 +0,0 @@ -CLASS cdy net/minecraft/sortme/structures/processor/RuleStructureProcessor - FIELD a rules Lcom/google/common/collect/ImmutableList; diff --git a/mappings/net/minecraft/world/gen/feature/structure/JigsawJunction.mapping b/mappings/net/minecraft/structure/JigsawJunction.mapping similarity index 87% rename from mappings/net/minecraft/world/gen/feature/structure/JigsawJunction.mapping rename to mappings/net/minecraft/structure/JigsawJunction.mapping index 2f47b9aab3..39e2e94e2c 100644 --- a/mappings/net/minecraft/world/gen/feature/structure/JigsawJunction.mapping +++ b/mappings/net/minecraft/structure/JigsawJunction.mapping @@ -1,4 +1,4 @@ -CLASS caa net/minecraft/world/gen/feature/structure/JigsawJunction +CLASS caa net/minecraft/structure/JigsawJunction FIELD a sourceX I FIELD b sourceGroundY I FIELD c sourceZ I @@ -9,6 +9,7 @@ CLASS caa net/minecraft/world/gen/feature/structure/JigsawJunction ARG 2 sourceGroundY ARG 3 sourceZ ARG 4 deltaY + ARG 5 destProjection METHOD a getSourceX ()I METHOD a deserialize (Lcom/mojang/datafixers/Dynamic;)Lcaa; ARG 0 dynamic diff --git a/mappings/net/minecraft/structure/PoolStructurePiece.mapping b/mappings/net/minecraft/structure/PoolStructurePiece.mapping new file mode 100644 index 0000000000..04c24d7baf --- /dev/null +++ b/mappings/net/minecraft/structure/PoolStructurePiece.mapping @@ -0,0 +1,17 @@ +CLASS cdb net/minecraft/structure/PoolStructurePiece + FIELD a poolElement Lcae; + FIELD b pos Let; + FIELD c rotation Lbly; + FIELD d groundLevelDelta I + FIELD e junctions Ljava/util/List; + FIELD f structureManager Lceb; + METHOD (Lbzi;Lceb;Lcae;Let;ILbly;)V + ARG 3 poolElement + METHOD a (Lbcm;Ljava/util/Random;Lcco;Lbby;)Z + ARG 2 random + METHOD a addJunction (Lcaa;)V + ARG 1 junction + METHOD b getPoolElement ()Lcae; + METHOD c getPos ()Let; + METHOD d getGroundLevelDelta ()I + METHOD e getJunctions ()Ljava/util/List; diff --git a/mappings/net/minecraft/structure/SimpleStructurePiece.mapping b/mappings/net/minecraft/structure/SimpleStructurePiece.mapping new file mode 100644 index 0000000000..2dfe83041f --- /dev/null +++ b/mappings/net/minecraft/structure/SimpleStructurePiece.mapping @@ -0,0 +1,17 @@ +CLASS cdk net/minecraft/structure/SimpleStructurePiece + FIELD a structure Lcef; + FIELD b placementData Lcec; + FIELD c pos Let; + FIELD d LOGGER Lorg/apache/logging/log4j/Logger; + METHOD a (Lbcm;Ljava/util/Random;Lcco;Lbby;)Z + ARG 2 random + METHOD a setStructureData (Lcef;Let;Lcec;)V + ARG 1 structure + ARG 2 pos + ARG 3 placementData + METHOD a handleMetadata (Ljava/lang/String;Let;Lbcm;Ljava/util/Random;Lcco;)V + ARG 1 metadata + ARG 2 pos + ARG 3 world + ARG 4 random + ARG 5 boundingBox diff --git a/mappings/net/minecraft/sortme/Structure.mapping b/mappings/net/minecraft/structure/Structure.mapping similarity index 74% rename from mappings/net/minecraft/sortme/Structure.mapping rename to mappings/net/minecraft/structure/Structure.mapping index 87e14991b5..19af127c1e 100644 --- a/mappings/net/minecraft/sortme/Structure.mapping +++ b/mappings/net/minecraft/structure/Structure.mapping @@ -1,4 +1,4 @@ -CLASS cef net/minecraft/sortme/Structure +CLASS cef net/minecraft/structure/Structure CLASS cef$b StructureBlockInfo FIELD a pos Let; FIELD b state Lbqk; @@ -21,11 +21,19 @@ CLASS cef net/minecraft/sortme/Structure FIELD d author Ljava/lang/String; METHOD a getSize ()Let; METHOD a place (Lbcm;Let;Lcec;)V + METHOD a process (Lbcm;Let;Lcec;Ljava/util/List;)Ljava/util/List; + ARG 0 world + ARG 1 pos + ARG 2 placementData + ARG 3 blockInfos METHOD a toTag (Lhr;)Lhr; ARG 1 tag METHOD a setAuthor (Ljava/lang/String;)V METHOD a createDoubleListTag ([D)Lhx; METHOD a createIntListTag ([I)Lhx; METHOD b getAuthor ()Ljava/lang/String; + METHOD b calculateBoundingBox (Lcec;Let;)Lcco; + ARG 1 placementData + ARG 2 pos METHOD b fromTag (Lhr;)V ARG 1 tag diff --git a/mappings/net/minecraft/sortme/structures/StructureManager.mapping b/mappings/net/minecraft/structure/StructureManager.mapping similarity index 93% rename from mappings/net/minecraft/sortme/structures/StructureManager.mapping rename to mappings/net/minecraft/structure/StructureManager.mapping index 4134aef385..6b0cd165f0 100644 --- a/mappings/net/minecraft/sortme/structures/StructureManager.mapping +++ b/mappings/net/minecraft/structure/StructureManager.mapping @@ -1,4 +1,4 @@ -CLASS ceb net/minecraft/sortme/structures/StructureManager +CLASS ceb net/minecraft/structure/StructureManager FIELD a LOGGER Lorg/apache/logging/log4j/Logger; FIELD b structures Ljava/util/Map; FIELD c dataFixer Lcom/mojang/datafixers/DataFixer; diff --git a/mappings/cdh.mapping b/mappings/net/minecraft/structure/StructurePiece.mapping similarity index 78% rename from mappings/cdh.mapping rename to mappings/net/minecraft/structure/StructurePiece.mapping index 1903ee0465..4ac310a1d5 100644 --- a/mappings/cdh.mapping +++ b/mappings/net/minecraft/structure/StructurePiece.mapping @@ -1,4 +1,4 @@ -CLASS cdh +CLASS cdh net/minecraft/structure/StructurePiece CLASS cdh$a FIELD a block Lbqk; METHOD a getBlock ()Lbqk; @@ -8,12 +8,19 @@ CLASS cdh FIELD a facing Ley; FIELD b mirror Lbky; FIELD c rotation Lbly; - FIELD m blockAir Lbqk; - FIELD n structureBounds Lcco; + FIELD d type Lbzi; + FIELD e BLOCKS_NEEDING_POST_PROCESSING Ljava/util/Set; + FIELD m AIR Lbqk; + FIELD n boundingBox Lcco; + METHOD (Lbzi;I)V + ARG 1 type + METHOD (Lbzi;Lhr;)V + ARG 2 tag METHOD a applyXTransform (II)I METHOD a translate (III)V ARG 1 x ARG 2 y + ARG 3 z METHOD a getBlockAt (Lbbw;IIILcco;)Lbqk; ARG 2 x ARG 3 y @@ -67,13 +74,20 @@ CLASS cdh ARG 1 world ARG 3 random ARG 4 pos - METHOD a (Lbcm;Ljava/util/Random;Lcco;Lbby;)Z + METHOD a generate (Lbcm;Ljava/util/Random;Lcco;Lbby;)Z + ARG 1 world ARG 2 random + ARG 3 boundingBox + ARG 4 pos METHOD a isUnderSeaLevel (Lbcp;IIILcco;)Z ARG 2 x ARG 3 z ARG 4 y + METHOD a setOrientation (Ley;)V + ARG 1 orientation METHOD a toNbt (Lhr;)V + ARG 1 tag + METHOD ad_ getRotation ()Lbly; METHOD b applyZTransform (II)I METHOD b (Lbcm;Lbqk;IIILcco;)V ARG 1 world @@ -90,4 +104,6 @@ CLASS cdh ARG 7 maxY METHOD d applyYTransform (I)I METHOD f getTag ()Lhr; + METHOD g getBoundingBox ()Lcco; METHOD i getFacing ()Ley; + METHOD k getType ()Lbzi; diff --git a/mappings/net/minecraft/structure/StructurePieceType.mapping b/mappings/net/minecraft/structure/StructurePieceType.mapping new file mode 100644 index 0000000000..704ca9cdf1 --- /dev/null +++ b/mappings/net/minecraft/structure/StructurePieceType.mapping @@ -0,0 +1,29 @@ +CLASS bzi net/minecraft/structure/StructurePieceType + FIELD F STRONGHOLD_START Lbzi; + FIELD I JUNGLE_TEMPLE Lbzi; + FIELD J OCEAN_TEMPLE Lbzi; + FIELD K IGLOO Lbzi; + FIELD L SWAMP_HUT Lbzi; + FIELD M DESERT_TEMPLE Lbzi; + FIELD U OCEAN_MONUMENT_ENTRY Lbzi; + FIELD V OCEAN_MONUMENT_PENTHOUSE Lbzi; + FIELD W OCEAN_MONUMENT_SIMPLE_ROOM Lbzi; + FIELD X OCEAN_MONUMENT_SIMPLE_ROOM_TOP Lbzi; + FIELD Z END_CITY Lbzi; + FIELD a MINESHAFT_CORRIDOR Lbzi; + FIELD aa WOODLAND_MANSION Lbzi; + FIELD ab BURIED_TREASURE Lbzi; + FIELD ac SHIPWRECK Lbzi; + FIELD b MINESHAFT_CROSSING Lbzi; + FIELD c MINESHAFT_ROOM Lbzi; + FIELD d MINESHAFT_STAIRS Lbzi; + FIELD e PILLAGER_OUTPOST Lbzi; + FIELD f VILLAGE Lbzi; + FIELD u NETHER_FORTRESS_START Lbzi; + FIELD x STRONGHOLD_FIVE_WAY_CROSSING Lbzi; + METHOD a register (Lbzi;Ljava/lang/String;)Lbzi; + ARG 0 pieceType + ARG 1 id + METHOD load (Lceb;Lhr;)Lcdh; + ARG 1 structureManager + ARG 2 tag diff --git a/mappings/net/minecraft/sortme/StructurePlacementData.mapping b/mappings/net/minecraft/structure/StructurePlacementData.mapping similarity index 66% rename from mappings/net/minecraft/sortme/StructurePlacementData.mapping rename to mappings/net/minecraft/structure/StructurePlacementData.mapping index 5532a5610f..59ca89e3b3 100644 --- a/mappings/net/minecraft/sortme/StructurePlacementData.mapping +++ b/mappings/net/minecraft/structure/StructurePlacementData.mapping @@ -1,10 +1,13 @@ -CLASS cec net/minecraft/sortme/StructurePlacementData +CLASS cec net/minecraft/structure/StructurePlacementData FIELD a mirror Lbky; FIELD b rotation Lbly; FIELD c position Let; FIELD d ignoreEntities Z FIELD e chunkPosition Lbby; FIELD f boundingBox Lcco; + FIELD g placeFluids Z + FIELD h random Ljava/util/Random; + FIELD i seed Ljava/lang/Long; FIELD l processors Ljava/util/List; METHOD a copy ()Lcec; METHOD a setChunkPosition (Lbby;)Lcec; @@ -17,11 +20,19 @@ CLASS cec net/minecraft/sortme/StructurePlacementData ARG 1 processor METHOD a setPosition (Let;)Lcec; ARG 1 position + METHOD a setSeed (Ljava/lang/Long;)Lcec; + ARG 1 seed + METHOD a setRandom (Ljava/util/Random;)Lcec; + ARG 1 random METHOD a setIgnoreEntities (Z)Lcec; METHOD b clearProcessors ()Lcec; METHOD b removeProcessor (Lced;)Lcec; ARG 1 processor + METHOD b getRandom (Let;)Ljava/util/Random; + ARG 1 pos METHOD c getMirror ()Lbky; METHOD d getRotation ()Lbly; METHOD e getPosition ()Let; + METHOD h shouldIgnoreEntities ()Z METHOD k getProcessors ()Ljava/util/List; + METHOD m shouldPlaceFluids ()Z diff --git a/mappings/net/minecraft/structure/StructureStart.mapping b/mappings/net/minecraft/structure/StructureStart.mapping new file mode 100644 index 0000000000..41b5ede8d4 --- /dev/null +++ b/mappings/net/minecraft/structure/StructureStart.mapping @@ -0,0 +1,42 @@ +CLASS cdi net/minecraft/structure/StructureStart + CLASS cdi$1 + METHOD (Lbzh;IILbdj;Lcco;IJ)V + ARG 2 chunkX + ARG 3 chunkZ + FIELD a DEFAULT Lcdi; + FIELD b children Ljava/util/List; + FIELD c boundingBox Lcco; + FIELD d random Lbua; + FIELD e feature Lbzh; + FIELD f chunkX I + FIELD g chunkZ I + FIELD h biome Lbdj; + FIELD i references I + METHOD (Lbzh;IILbdj;Lcco;IJ)V + ARG 2 chunkX + ARG 3 chunkZ + METHOD a getPos ()Let; + METHOD a toTag (II)Lhr; + ARG 1 chunkX + ARG 2 chunkZ + METHOD a generateStructure (Lbcm;Ljava/util/Random;Lcco;Lbby;)V + ARG 1 world + ARG 2 random + ARG 3 boundingBox + ARG 4 pos + METHOD a initialize (Lbrz;Lceb;IILbdj;)V + ARG 1 chunkGenerator + ARG 2 structureManager + ARG 3 x + ARG 4 z + ARG 5 biome + METHOD b getBoundingBox ()Lcco; + METHOD c getChildren ()Ljava/util/List; + METHOD d setBoundingBoxFromChildren ()V + METHOD e hasChildren ()Z + METHOD f getChunkX ()I + METHOD g getChunkZ ()I + METHOD h isInExistingChunk ()Z + METHOD i incrementReferences ()V + METHOD j getReferenceCountToBeInExistingChunk ()I + METHOD k getFeature ()Lbzh; diff --git a/mappings/net/minecraft/structure/generator/BuriedTreasureGenerator.mapping b/mappings/net/minecraft/structure/generator/BuriedTreasureGenerator.mapping new file mode 100644 index 0000000000..f8a12d5848 --- /dev/null +++ b/mappings/net/minecraft/structure/generator/BuriedTreasureGenerator.mapping @@ -0,0 +1,10 @@ +CLASS ccp net/minecraft/structure/generator/BuriedTreasureGenerator + CLASS ccp$a Piece + METHOD (Lceb;Lhr;)V + ARG 2 tag + METHOD (Let;)V + ARG 1 pos + METHOD a (Lbcm;Ljava/util/Random;Lcco;Lbby;)Z + ARG 2 random + METHOD a isLiquid (Lbqk;)Z + ARG 1 state diff --git a/mappings/net/minecraft/structure/generator/DesertTempleGenerator.mapping b/mappings/net/minecraft/structure/generator/DesertTempleGenerator.mapping new file mode 100644 index 0000000000..4d6302eb78 --- /dev/null +++ b/mappings/net/minecraft/structure/generator/DesertTempleGenerator.mapping @@ -0,0 +1,4 @@ +CLASS ccq net/minecraft/structure/generator/DesertTempleGenerator + FIELD e hasPlacedChest [Z + METHOD a (Lbcm;Ljava/util/Random;Lcco;Lbby;)Z + ARG 2 random diff --git a/mappings/net/minecraft/structure/generator/EndCityGenerator.mapping b/mappings/net/minecraft/structure/generator/EndCityGenerator.mapping new file mode 100644 index 0000000000..c4922df087 --- /dev/null +++ b/mappings/net/minecraft/structure/generator/EndCityGenerator.mapping @@ -0,0 +1,24 @@ +CLASS ccr net/minecraft/structure/generator/EndCityGenerator + CLASS ccr$a Piece + FIELD d template Ljava/lang/String; + FIELD e rotation Lbly; + METHOD (Lceb;Ljava/lang/String;Let;Lbly;Z)V + ARG 1 structureManager + ARG 2 template + ARG 3 pos + ARG 4 rotation + METHOD a addPieces (Lceb;Let;Lbly;Ljava/util/List;Ljava/util/Random;)V + ARG 0 structureManager + ARG 1 pos + ARG 2 rotation + ARG 3 pieces + ARG 4 random + METHOD b createPiece (Lceb;Lccr$a;Let;Ljava/lang/String;Lbly;Z)Lccr$a; + ARG 0 structureManager + ARG 1 lastPiece + ARG 2 relativePosition + ARG 3 template + ARG 4 rotation + METHOD b addPiece (Ljava/util/List;Lccr$a;)Lccr$a; + ARG 0 pieces + ARG 1 piece diff --git a/mappings/net/minecraft/structure/generator/IglooGenerator.mapping b/mappings/net/minecraft/structure/generator/IglooGenerator.mapping new file mode 100644 index 0000000000..5f07623112 --- /dev/null +++ b/mappings/net/minecraft/structure/generator/IglooGenerator.mapping @@ -0,0 +1,9 @@ +CLASS ccs net/minecraft/structure/generator/IglooGenerator + CLASS ccs$a Piece + FIELD d template Lqd; + FIELD e rotation Lbly; + METHOD a (Lbcm;Ljava/util/Random;Lcco;Lbby;)Z + ARG 2 random + FIELD a TOP_TEMPLATE Lqd; + FIELD b MIDDLE_TEMPLATE Lqd; + FIELD c BOTTOM_TEMPLATE Lqd; diff --git a/mappings/net/minecraft/structure/generator/JungleTempleGenerator.mapping b/mappings/net/minecraft/structure/generator/JungleTempleGenerator.mapping new file mode 100644 index 0000000000..c02b46f05e --- /dev/null +++ b/mappings/net/minecraft/structure/generator/JungleTempleGenerator.mapping @@ -0,0 +1,11 @@ +CLASS cct net/minecraft/structure/generator/JungleTempleGenerator + CLASS cct$a + METHOD a (Ljava/util/Random;IIIZ)V + ARG 1 random + ARG 2 x + FIELD e placedMainChest Z + FIELD f placedHiddenChest Z + FIELD g placedTrap1 Z + FIELD h placedTrap2 Z + METHOD a (Lbcm;Ljava/util/Random;Lcco;Lbby;)Z + ARG 2 random diff --git a/mappings/net/minecraft/sortme/structures/MineshaftGenerator.mapping b/mappings/net/minecraft/structure/generator/MineshaftGenerator.mapping similarity index 79% rename from mappings/net/minecraft/sortme/structures/MineshaftGenerator.mapping rename to mappings/net/minecraft/structure/generator/MineshaftGenerator.mapping index 7eb0e66de4..5a1caca7a3 100644 --- a/mappings/net/minecraft/sortme/structures/MineshaftGenerator.mapping +++ b/mappings/net/minecraft/structure/generator/MineshaftGenerator.mapping @@ -1,10 +1,16 @@ -CLASS ccv net/minecraft/sortme/structures/MineshaftGenerator +CLASS ccv net/minecraft/structure/generator/MineshaftGenerator CLASS ccv$a MineshaftCorridor + FIELD b hasRails Z + FIELD c hasCobwebs Z + FIELD d hasSpawner Z + FIELD e length I METHOD a (Lbcm;Lcco;Ljava/util/Random;IIILqd;)Z ARG 3 random METHOD a (Lbcm;Ljava/util/Random;Lcco;Lbby;)Z ARG 2 random CLASS ccv$b MineshaftCrossing + FIELD b direction Ley; + FIELD c twoFloors Z METHOD a (Lbcm;Ljava/util/Random;Lcco;Lbby;)Z ARG 2 random METHOD a (Ljava/util/List;Ljava/util/Random;IIILey;)Lcco; @@ -12,6 +18,7 @@ CLASS ccv net/minecraft/sortme/structures/MineshaftGenerator CLASS ccv$c MineshaftPart FIELD a mineshaftType Lbxl$b; CLASS ccv$d MineshaftRoom + FIELD b entrances Ljava/util/List; METHOD (ILjava/util/Random;IILbxl$b;)V ARG 2 random METHOD a (Lbcm;Ljava/util/Random;Lcco;Lbby;)Z diff --git a/mappings/net/minecraft/structure/generator/NetherFortressGenerator.mapping b/mappings/net/minecraft/structure/generator/NetherFortressGenerator.mapping new file mode 100644 index 0000000000..a437d5d1ec --- /dev/null +++ b/mappings/net/minecraft/structure/generator/NetherFortressGenerator.mapping @@ -0,0 +1,2 @@ +CLASS ccw net/minecraft/structure/generator/NetherFortressGenerator + CLASS ccw$q Start diff --git a/mappings/ccx.mapping b/mappings/net/minecraft/structure/generator/OceanMonumentGenerator.mapping similarity index 84% rename from mappings/ccx.mapping rename to mappings/net/minecraft/structure/generator/OceanMonumentGenerator.mapping index 0212487602..cf563c899c 100644 --- a/mappings/ccx.mapping +++ b/mappings/net/minecraft/structure/generator/OceanMonumentGenerator.mapping @@ -1,4 +1,4 @@ -CLASS ccx +CLASS ccx net/minecraft/structure/generator/OceanMonumentGenerator CLASS ccx$h METHOD a (Lbcm;Ljava/util/Random;Lcco;Lbby;)Z ARG 2 random @@ -20,16 +20,16 @@ CLASS ccx CLASS ccx$o METHOD a (Lbcm;Ljava/util/Random;Lcco;Lbby;)Z ARG 2 random - CLASS ccx$p + CLASS ccx$p Entry METHOD a (Lbcm;Ljava/util/Random;Lcco;Lbby;)Z ARG 2 random - CLASS ccx$q + CLASS ccx$q Penthouse METHOD a (Lbcm;Ljava/util/Random;Lcco;Lbby;)Z ARG 2 random - CLASS ccx$s + CLASS ccx$s SimpleRoom METHOD a (Lbcm;Ljava/util/Random;Lcco;Lbby;)Z ARG 2 random - CLASS ccx$t + CLASS ccx$t SimpleRoomTop METHOD a (Lbcm;Ljava/util/Random;Lcco;Lbby;)Z ARG 2 random CLASS ccx$u diff --git a/mappings/net/minecraft/structure/generator/OceanTempleGenerator.mapping b/mappings/net/minecraft/structure/generator/OceanTempleGenerator.mapping new file mode 100644 index 0000000000..9df14bf419 --- /dev/null +++ b/mappings/net/minecraft/structure/generator/OceanTempleGenerator.mapping @@ -0,0 +1,37 @@ +CLASS ccz net/minecraft/structure/generator/OceanTempleGenerator + CLASS ccz$a Piece + FIELD d biomeType Lccy$b; + FIELD e integrity F + FIELD f template Lqd; + FIELD g rotation Lbly; + FIELD h large Z + METHOD (Lceb;Lqd;Let;Lbly;FLccy$b;Z)V + ARG 1 structureManager + ARG 2 template + ARG 3 pos + ARG 4 rotation + ARG 5 integrity + ARG 6 biomeType + ARG 7 large + METHOD a (Lbcm;Ljava/util/Random;Lcco;Lbby;)Z + ARG 2 random + METHOD a initialize (Lceb;)V + ARG 1 structureManager + FIELD a WARM_RUINS [Lqd; + FIELD b BRICK_RUINS [Lqd; + FIELD c CRACKED_RUINS [Lqd; + FIELD d MOSSY_RUINS [Lqd; + FIELD e BIG_BRICK_RUINS [Lqd; + FIELD f BIG_MOSSY_RUINS [Lqd; + FIELD g BIG_CRACKED_RUINS [Lqd; + FIELD h BIG_WARM_RUINS [Lqd; + METHOD a (Lceb;Let;Lbly;Ljava/util/List;Ljava/util/Random;Lbxs;ZF)V + ARG 1 pos + ARG 2 rotation + ARG 5 config + ARG 6 large + ARG 7 integrity + METHOD a getRandomWarmRuin (Ljava/util/Random;)Lqd; + ARG 0 random + METHOD b getRandomBigWarmRuin (Ljava/util/Random;)Lqd; + ARG 0 random diff --git a/mappings/net/minecraft/structure/generator/PillagerOutpostGenerator.mapping b/mappings/net/minecraft/structure/generator/PillagerOutpostGenerator.mapping new file mode 100644 index 0000000000..4230da7e18 --- /dev/null +++ b/mappings/net/minecraft/structure/generator/PillagerOutpostGenerator.mapping @@ -0,0 +1,8 @@ +CLASS cda net/minecraft/structure/generator/PillagerOutpostGenerator + CLASS cda$a Piece + METHOD a addPieces (Lbrz;Lceb;Let;Ljava/util/List;Lbua;)V + ARG 0 chunkGenerator + ARG 1 structureManager + ARG 2 pos + ARG 3 pieces + ARG 4 random diff --git a/mappings/net/minecraft/structure/generator/ShipwreckGenerator.mapping b/mappings/net/minecraft/structure/generator/ShipwreckGenerator.mapping new file mode 100644 index 0000000000..65d58edcb4 --- /dev/null +++ b/mappings/net/minecraft/structure/generator/ShipwreckGenerator.mapping @@ -0,0 +1,16 @@ +CLASS cdd net/minecraft/structure/generator/ShipwreckGenerator + CLASS cdd$a Piece + FIELD d rotation Lbly; + FIELD e template Lqd; + FIELD f isBeached Z + METHOD a (Lbcm;Ljava/util/Random;Lcco;Lbby;)Z + ARG 2 random + FIELD b BEACHED_TEMPLATES [Lqd; + FIELD c REGULAR_TEMPLATES [Lqd; + METHOD a addParts (Lceb;Let;Lbly;Ljava/util/List;Ljava/util/Random;Lbyr;)V + ARG 0 structureManager + ARG 1 pos + ARG 2 rotation + ARG 3 children + ARG 4 random + ARG 5 config diff --git a/mappings/net/minecraft/structure/generator/StrongholdGenerator.mapping b/mappings/net/minecraft/structure/generator/StrongholdGenerator.mapping new file mode 100644 index 0000000000..3ee5349f39 --- /dev/null +++ b/mappings/net/minecraft/structure/generator/StrongholdGenerator.mapping @@ -0,0 +1,11 @@ +CLASS cde net/minecraft/structure/generator/StrongholdGenerator + CLASS cde$m Start + CLASS cde$c FiveWayCrossing + FIELD a leftLow Z + FIELD b leftHigh Z + FIELD c rightLow Z + FIELD e rightHigh Z + CLASS cde$p + CLASS cde$p$a + FIELD d entryDoor Lcde$p$a; + CLASS cde$p$a Door diff --git a/mappings/net/minecraft/sortme/structures/SwampHutGenerator.mapping b/mappings/net/minecraft/structure/generator/SwampHutGenerator.mapping similarity index 50% rename from mappings/net/minecraft/sortme/structures/SwampHutGenerator.mapping rename to mappings/net/minecraft/structure/generator/SwampHutGenerator.mapping index 50006edb96..c582884569 100644 --- a/mappings/net/minecraft/sortme/structures/SwampHutGenerator.mapping +++ b/mappings/net/minecraft/structure/generator/SwampHutGenerator.mapping @@ -1,3 +1,3 @@ -CLASS cdj net/minecraft/sortme/structures/SwampHutGenerator +CLASS cdj net/minecraft/structure/generator/SwampHutGenerator METHOD a (Lbcm;Ljava/util/Random;Lcco;Lbby;)Z ARG 2 random diff --git a/mappings/net/minecraft/structure/generator/WoodlandMansionGenerator.mapping b/mappings/net/minecraft/structure/generator/WoodlandMansionGenerator.mapping new file mode 100644 index 0000000000..e9b4b57f02 --- /dev/null +++ b/mappings/net/minecraft/structure/generator/WoodlandMansionGenerator.mapping @@ -0,0 +1,5 @@ +CLASS cdl net/minecraft/structure/generator/WoodlandMansionGenerator + CLASS cdl$i Piece + FIELD d template Ljava/lang/String; + FIELD e rotation Lbly; + FIELD f mirror Lbky; diff --git a/mappings/net/minecraft/structure/generator/village/DesertVillageData.mapping b/mappings/net/minecraft/structure/generator/village/DesertVillageData.mapping new file mode 100644 index 0000000000..1cb3e5e63e --- /dev/null +++ b/mappings/net/minecraft/structure/generator/village/DesertVillageData.mapping @@ -0,0 +1,2 @@ +CLASS bvs net/minecraft/structure/generator/village/DesertVillageData + METHOD a initialize ()V diff --git a/mappings/net/minecraft/structure/generator/village/PlainsVillageData.mapping b/mappings/net/minecraft/structure/generator/village/PlainsVillageData.mapping new file mode 100644 index 0000000000..99adab8afe --- /dev/null +++ b/mappings/net/minecraft/structure/generator/village/PlainsVillageData.mapping @@ -0,0 +1,2 @@ +CLASS bxz net/minecraft/structure/generator/village/PlainsVillageData + METHOD a initialize ()V diff --git a/mappings/net/minecraft/structure/generator/village/SavannaVillageData.mapping b/mappings/net/minecraft/structure/generator/village/SavannaVillageData.mapping new file mode 100644 index 0000000000..e382a640a6 --- /dev/null +++ b/mappings/net/minecraft/structure/generator/village/SavannaVillageData.mapping @@ -0,0 +1,2 @@ +CLASS byn net/minecraft/structure/generator/village/SavannaVillageData + METHOD a initialize ()V diff --git a/mappings/net/minecraft/structure/generator/village/SnowyVillageData.mapping b/mappings/net/minecraft/structure/generator/village/SnowyVillageData.mapping new file mode 100644 index 0000000000..069400d17d --- /dev/null +++ b/mappings/net/minecraft/structure/generator/village/SnowyVillageData.mapping @@ -0,0 +1,2 @@ +CLASS bza net/minecraft/structure/generator/village/SnowyVillageData + METHOD a initialize ()V diff --git a/mappings/net/minecraft/structure/generator/village/TaigaVillageData.mapping b/mappings/net/minecraft/structure/generator/village/TaigaVillageData.mapping new file mode 100644 index 0000000000..ca0908afe7 --- /dev/null +++ b/mappings/net/minecraft/structure/generator/village/TaigaVillageData.mapping @@ -0,0 +1,2 @@ +CLASS bzn net/minecraft/structure/generator/village/TaigaVillageData + METHOD a initialize ()V diff --git a/mappings/net/minecraft/structure/generator/village/VillageGenerator.mapping b/mappings/net/minecraft/structure/generator/village/VillageGenerator.mapping new file mode 100644 index 0000000000..4c958efe88 --- /dev/null +++ b/mappings/net/minecraft/structure/generator/village/VillageGenerator.mapping @@ -0,0 +1,9 @@ +CLASS bzr net/minecraft/structure/generator/village/VillageGenerator + CLASS bzr$a Piece + METHOD a addPieces (Lbrz;Lceb;Let;Ljava/util/List;Lbua;Lbzp;)V + ARG 0 chunkGenerator + ARG 1 structureManager + ARG 2 pos + ARG 3 pieces + ARG 4 random + ARG 5 config diff --git a/mappings/net/minecraft/structure/pool/EmptyPoolElement.mapping b/mappings/net/minecraft/structure/pool/EmptyPoolElement.mapping new file mode 100644 index 0000000000..b4853872cc --- /dev/null +++ b/mappings/net/minecraft/structure/pool/EmptyPoolElement.mapping @@ -0,0 +1,2 @@ +CLASS bzy net/minecraft/structure/pool/EmptyPoolElement + FIELD a INSTANCE Lbzy; diff --git a/mappings/net/minecraft/structure/pool/FeaturePoolElement.mapping b/mappings/net/minecraft/structure/pool/FeaturePoolElement.mapping new file mode 100644 index 0000000000..6d9fd0e0f8 --- /dev/null +++ b/mappings/net/minecraft/structure/pool/FeaturePoolElement.mapping @@ -0,0 +1,5 @@ +CLASS bzz net/minecraft/structure/pool/FeaturePoolElement + FIELD a feature Lbvb; + FIELD b tag Lhr; + METHOD (Lbvb;)V + ARG 1 feature diff --git a/mappings/net/minecraft/structure/pool/ListPoolElement.mapping b/mappings/net/minecraft/structure/pool/ListPoolElement.mapping new file mode 100644 index 0000000000..5c5b65e8d2 --- /dev/null +++ b/mappings/net/minecraft/structure/pool/ListPoolElement.mapping @@ -0,0 +1,2 @@ +CLASS cac net/minecraft/structure/pool/ListPoolElement + FIELD a elements Ljava/util/List; diff --git a/mappings/cad.mapping b/mappings/net/minecraft/structure/pool/SinglePoolElement.mapping similarity index 67% rename from mappings/cad.mapping rename to mappings/net/minecraft/structure/pool/SinglePoolElement.mapping index d81bef0210..dc9c5f03a6 100644 --- a/mappings/cad.mapping +++ b/mappings/net/minecraft/structure/pool/SinglePoolElement.mapping @@ -1,5 +1,6 @@ -CLASS cad +CLASS cad net/minecraft/structure/pool/SinglePoolElement FIELD a location Lqd; FIELD b processors Lcom/google/common/collect/ImmutableList; METHOD (Ljava/lang/String;Ljava/util/List;)V ARG 1 location + ARG 2 processors diff --git a/mappings/net/minecraft/structure/pool/StructurePool.mapping b/mappings/net/minecraft/structure/pool/StructurePool.mapping new file mode 100644 index 0000000000..ec42133862 --- /dev/null +++ b/mappings/net/minecraft/structure/pool/StructurePool.mapping @@ -0,0 +1,35 @@ +CLASS cag net/minecraft/structure/pool/StructurePool + CLASS cag$a Projection + FIELD a TERRAIN_MATCHING Lcag$a; + FIELD b RIGID Lcag$a; + FIELD c PROJECTIONS_BY_ID Ljava/util/Map; + FIELD d id Ljava/lang/String; + FIELD e processors Lcom/google/common/collect/ImmutableList; + METHOD (Ljava/lang/String;Lcom/google/common/collect/ImmutableList;)V + ARG 1 id + ARG 2 processors + METHOD a getId ()Ljava/lang/String; + METHOD a getById (Ljava/lang/String;)Lcag$a; + ARG 0 id + METHOD b getProcessors ()Lcom/google/common/collect/ImmutableList; + FIELD a EMPTY Lcag; + FIELD b INVALID Lcag; + FIELD c id Lqd; + FIELD d elementCounts Lcom/google/common/collect/ImmutableList; + FIELD e elements Ljava/util/List; + FIELD f terminatorsId Lqd; + FIELD g projection Lcag$a; + METHOD (Lqd;Lqd;Ljava/util/List;Lcag$a;)V + ARG 1 id + ARG 2 terminatorsId + ARG 3 elementCounts + ARG 4 projection + METHOD a getTerminatorsId ()Lqd; + METHOD a getElement (I)Lcae; + ARG 1 index + METHOD a getRandomElement (Ljava/util/Random;)Lcae; + ARG 1 random + METHOD b getId ()Lqd; + METHOD b getElementIndicesInRandomOrder (Ljava/util/Random;)[I + ARG 1 random + METHOD c getElementCount ()I diff --git a/mappings/net/minecraft/structure/pool/StructurePoolBasedGenerator.mapping b/mappings/net/minecraft/structure/pool/StructurePoolBasedGenerator.mapping new file mode 100644 index 0000000000..5c97658b65 --- /dev/null +++ b/mappings/net/minecraft/structure/pool/StructurePoolBasedGenerator.mapping @@ -0,0 +1,30 @@ +CLASS cab net/minecraft/structure/pool/StructurePoolBasedGenerator + CLASS cab$a PieceFactory + FIELD a REGISTRY Lcah; + FIELD b LOGGER Lorg/apache/logging/log4j/Logger; + METHOD a addPieces (Lcab$a;Lcdb;Lbrz;Lceb;Ljava/util/List;Ljava/util/Random;II)V + ARG 0 pieceFactory + ARG 1 firstPiece + ARG 2 chunkGenerator + ARG 3 structureManager + ARG 4 pieces + ARG 5 random + ARG 6 currentSize + ARG 7 size + METHOD a addPieces (Lcab$a;Lcdb;Lbrz;Lceb;Ljava/util/List;Ljava/util/Random;Lcae;Lcef$b;Lcco;Ljava/util/List;Let;Lcag;II)Z + ARG 0 pieceFactory + ARG 1 startPiece + ARG 2 chunkGenerator + ARG 3 structureManager + ARG 4 pieces + ARG 5 random + ARG 6 poolElement + METHOD a addPieces (Lqd;ILcab$a;Lbrz;Lceb;Let;Ljava/util/List;Ljava/util/Random;)V + ARG 0 startPoolId + ARG 1 size + ARG 2 pieceFactory + ARG 3 chunkGenerator + ARG 4 structureManager + ARG 5 pos + ARG 6 pieces + ARG 7 random diff --git a/mappings/net/minecraft/structure/pool/StructurePoolElement.mapping b/mappings/net/minecraft/structure/pool/StructurePoolElement.mapping new file mode 100644 index 0000000000..6d37d82933 --- /dev/null +++ b/mappings/net/minecraft/structure/pool/StructurePoolElement.mapping @@ -0,0 +1,22 @@ +CLASS cae net/minecraft/structure/pool/StructurePoolElement + FIELD a projection Lcag$a; + METHOD a getType ()Lcaf; + METHOD a setProjection (Lcag$a;)Lcae; + ARG 1 projection + METHOD a generate (Lceb;Lbcm;Let;Lbly;Lcco;Ljava/util/Random;)Z + ARG 1 structureManager + ARG 2 world + ARG 3 pos + ARG 4 rotation + ARG 5 boundingBox + ARG 6 random + METHOD a getBoundingBox (Lceb;Let;Lbly;)Lcco; + ARG 1 structureManager + ARG 2 pos + ARG 3 rotation + METHOD a getStructureBlockInfos (Lceb;Let;Lbly;Ljava/util/Random;)Ljava/util/List; + ARG 1 structureManager + ARG 2 pos + ARG 3 rotation + ARG 4 random + METHOD b getProjection ()Lcag$a; diff --git a/mappings/net/minecraft/structure/pool/StructurePoolElementType.mapping b/mappings/net/minecraft/structure/pool/StructurePoolElementType.mapping new file mode 100644 index 0000000000..0a08a3cec8 --- /dev/null +++ b/mappings/net/minecraft/structure/pool/StructurePoolElementType.mapping @@ -0,0 +1,6 @@ +CLASS caf net/minecraft/structure/pool/StructurePoolElementType + FIELD b SINGLE_POOL_ELEMENT Lcaf; + FIELD c LIST_POOL_ELEMENT Lcaf; + FIELD d FEATURE_POOL_ELEMENT Lcaf; + FIELD e EMPTY_POOL_ELEMENT Lcaf; + METHOD a register (Ljava/lang/String;Lcaf;)Lcaf; diff --git a/mappings/net/minecraft/structure/pool/StructurePoolRegistry.mapping b/mappings/net/minecraft/structure/pool/StructurePoolRegistry.mapping new file mode 100644 index 0000000000..209e75b4e2 --- /dev/null +++ b/mappings/net/minecraft/structure/pool/StructurePoolRegistry.mapping @@ -0,0 +1,6 @@ +CLASS cah net/minecraft/structure/pool/StructurePoolRegistry + FIELD a pools Ljava/util/Map; + METHOD a add (Lcag;)V + ARG 1 pool + METHOD a get (Lqd;)Lcag; + ARG 1 id diff --git a/mappings/net/minecraft/structure/processor/BlockIgnoreStructureProcessor.mapping b/mappings/net/minecraft/structure/processor/BlockIgnoreStructureProcessor.mapping new file mode 100644 index 0000000000..7421d293ec --- /dev/null +++ b/mappings/net/minecraft/structure/processor/BlockIgnoreStructureProcessor.mapping @@ -0,0 +1,5 @@ +CLASS cdo net/minecraft/structure/processor/BlockIgnoreStructureProcessor + FIELD a IGNORE_STRUCTURE_BLOCKS Lcdo; + FIELD b IGNORE_AIR Lcdo; + FIELD c IGNORE_AIR_AND_STRUCTURE_BLOCKS Lcdo; + FIELD d blocks Lcom/google/common/collect/ImmutableList; diff --git a/mappings/net/minecraft/structure/processor/BlockRotStructureProcessor.mapping b/mappings/net/minecraft/structure/processor/BlockRotStructureProcessor.mapping new file mode 100644 index 0000000000..062a82c871 --- /dev/null +++ b/mappings/net/minecraft/structure/processor/BlockRotStructureProcessor.mapping @@ -0,0 +1,4 @@ +CLASS cdq net/minecraft/structure/processor/BlockRotStructureProcessor + FIELD a integrity F + METHOD (F)V + ARG 1 integrity diff --git a/mappings/net/minecraft/sortme/structures/processor/GravityStructureProcessor.mapping b/mappings/net/minecraft/structure/processor/GravityStructureProcessor.mapping similarity index 57% rename from mappings/net/minecraft/sortme/structures/processor/GravityStructureProcessor.mapping rename to mappings/net/minecraft/structure/processor/GravityStructureProcessor.mapping index 05e4c050a4..0b5b988cdf 100644 --- a/mappings/net/minecraft/sortme/structures/processor/GravityStructureProcessor.mapping +++ b/mappings/net/minecraft/structure/processor/GravityStructureProcessor.mapping @@ -1,4 +1,4 @@ -CLASS cds net/minecraft/sortme/structures/processor/GravityStructureProcessor +CLASS cds net/minecraft/structure/processor/GravityStructureProcessor FIELD a heightmap Lbtq$a; FIELD b offset I METHOD (Lbtq$a;I)V diff --git a/mappings/net/minecraft/structure/processor/JigsawReplacementStructureProcessor.mapping b/mappings/net/minecraft/structure/processor/JigsawReplacementStructureProcessor.mapping new file mode 100644 index 0000000000..387522c976 --- /dev/null +++ b/mappings/net/minecraft/structure/processor/JigsawReplacementStructureProcessor.mapping @@ -0,0 +1,2 @@ +CLASS cdt net/minecraft/structure/processor/JigsawReplacementStructureProcessor + FIELD a INSTANCE Lcdt; diff --git a/mappings/net/minecraft/structure/processor/NopStructureProcessor.mapping b/mappings/net/minecraft/structure/processor/NopStructureProcessor.mapping new file mode 100644 index 0000000000..8247be55ae --- /dev/null +++ b/mappings/net/minecraft/structure/processor/NopStructureProcessor.mapping @@ -0,0 +1,2 @@ +CLASS cdu net/minecraft/structure/processor/NopStructureProcessor + FIELD a INSTANCE Lcdu; diff --git a/mappings/net/minecraft/structure/processor/RuleStructureProcessor.mapping b/mappings/net/minecraft/structure/processor/RuleStructureProcessor.mapping new file mode 100644 index 0000000000..b70e984f2d --- /dev/null +++ b/mappings/net/minecraft/structure/processor/RuleStructureProcessor.mapping @@ -0,0 +1,2 @@ +CLASS cdy net/minecraft/structure/processor/RuleStructureProcessor + FIELD a rules Lcom/google/common/collect/ImmutableList; diff --git a/mappings/net/minecraft/structure/processor/StructureProcessor.mapping b/mappings/net/minecraft/structure/processor/StructureProcessor.mapping new file mode 100644 index 0000000000..216d8d8cb8 --- /dev/null +++ b/mappings/net/minecraft/structure/processor/StructureProcessor.mapping @@ -0,0 +1,6 @@ +CLASS ced net/minecraft/structure/processor/StructureProcessor + METHOD a getType ()Lcee; + METHOD a process (Lbcp;Let;Lcef$b;Lcef$b;Lcec;)Lcef$b; + ARG 1 world + ARG 2 pos + ARG 5 placementData diff --git a/mappings/net/minecraft/structure/processor/StructureProcessorRule.mapping b/mappings/net/minecraft/structure/processor/StructureProcessorRule.mapping new file mode 100644 index 0000000000..7d80c0a079 --- /dev/null +++ b/mappings/net/minecraft/structure/processor/StructureProcessorRule.mapping @@ -0,0 +1,11 @@ +CLASS cdv net/minecraft/structure/processor/StructureProcessorRule + FIELD a inputPredicate Lcdz; + FIELD b locationPredicate Lcdz; + FIELD c outputState Lbqk; + FIELD d tag Lhr; + METHOD a getOutputState ()Lbqk; + METHOD a test (Lbqk;Lbqk;Ljava/util/Random;)Z + ARG 1 input + ARG 2 location + ARG 3 random + METHOD b getTag ()Lhr; diff --git a/mappings/net/minecraft/sortme/structures/processor/StructureProcessor.mapping b/mappings/net/minecraft/structure/processor/StructureProcessorType.mapping similarity index 52% rename from mappings/net/minecraft/sortme/structures/processor/StructureProcessor.mapping rename to mappings/net/minecraft/structure/processor/StructureProcessorType.mapping index 55c05e119e..9a78f5ae7b 100644 --- a/mappings/net/minecraft/sortme/structures/processor/StructureProcessor.mapping +++ b/mappings/net/minecraft/structure/processor/StructureProcessorType.mapping @@ -1,4 +1,4 @@ -CLASS cee net/minecraft/sortme/structures/processor/StructureProcessor +CLASS cee net/minecraft/structure/processor/StructureProcessorType METHOD a register (Ljava/lang/String;Lcee;)Lcee; ARG 0 id ARG 1 processor diff --git a/mappings/net/minecraft/util/Pair.mapping b/mappings/net/minecraft/util/Pair.mapping new file mode 100644 index 0000000000..be510823bc --- /dev/null +++ b/mappings/net/minecraft/util/Pair.mapping @@ -0,0 +1,8 @@ +CLASS zh net/minecraft/util/Pair + FIELD a left Lzh$A; + FIELD b right Lzh$B; + METHOD (Ljava/lang/Object;Ljava/lang/Object;)V + ARG 1 left + ARG 2 right + METHOD a getLeft ()Ljava/lang/Object; + METHOD b getRight ()Ljava/lang/Object; diff --git a/mappings/net/minecraft/util/Rotation.mapping b/mappings/net/minecraft/util/Rotation.mapping index 91f43a144d..f472cc2384 100644 --- a/mappings/net/minecraft/util/Rotation.mapping +++ b/mappings/net/minecraft/util/Rotation.mapping @@ -5,3 +5,5 @@ CLASS bly net/minecraft/util/Rotation FIELD d ROT_270 Lbly; METHOD a rotate (Ley;)Ley; ARG 1 direction + METHOD a random (Ljava/util/Random;)Lbly; + ARG 0 random diff --git a/mappings/net/minecraft/util/math/MutableIntBoundingBox.mapping b/mappings/net/minecraft/util/math/MutableIntBoundingBox.mapping index 0739b24e66..f47a8b5fb7 100644 --- a/mappings/net/minecraft/util/math/MutableIntBoundingBox.mapping +++ b/mappings/net/minecraft/util/math/MutableIntBoundingBox.mapping @@ -24,7 +24,7 @@ CLASS cco net/minecraft/util/math/MutableIntBoundingBox ARG 2 v2 METHOD ([I)V ARG 1 data - METHOD a maxSize ()Lcco; + METHOD a empty ()Lcco; METHOD a translate (III)V ARG 1 dx ARG 2 dy diff --git a/mappings/net/minecraft/world/ChunkSaveHandlerImpl.mapping b/mappings/net/minecraft/world/ChunkSaveHandlerImpl.mapping deleted file mode 100644 index 0a75d6e0dc..0000000000 --- a/mappings/net/minecraft/world/ChunkSaveHandlerImpl.mapping +++ /dev/null @@ -1,13 +0,0 @@ -CLASS bsw net/minecraft/world/ChunkSaveHandlerImpl - FIELD a LOGGER Lorg/apache/logging/log4j/Logger; - METHOD a writeStructuresTag (Lbby;Ljava/util/Map;Ljava/util/Map;)Lhr; - METHOD a saveChunk (Lbcl;Lbry;)Lhr; - METHOD a writeSectionsTag (Lbcl;Lceb;Lbby;Lhr;)Lbss; - METHOD a readStructureStarts (Lbrz;Lceb;Lbdl;Lhr;)Ljava/util/Map; - METHOD a getEntityStorageMode (Lhr;)Lbsd$b; - METHOD a (Lhr;Lbsk;)V - ARG 0 tag - ARG 1 chunk - METHOD a shortListsToNbt ([Lit/unimi/dsi/fastutil/shorts/ShortList;)Lhx; - ARG 0 lists - METHOD b readStructureReferences (Lhr;)Ljava/util/Map; diff --git a/mappings/net/minecraft/world/ChunkSerializer.mapping b/mappings/net/minecraft/world/ChunkSerializer.mapping new file mode 100644 index 0000000000..0373925227 --- /dev/null +++ b/mappings/net/minecraft/world/ChunkSerializer.mapping @@ -0,0 +1,28 @@ +CLASS bsw net/minecraft/world/ChunkSerializer + FIELD a LOGGER Lorg/apache/logging/log4j/Logger; + METHOD a writeStructures (Lbby;Ljava/util/Map;Ljava/util/Map;)Lhr; + ARG 0 pos + ARG 1 structureStarts + ARG 2 structureReferences + METHOD a serialize (Lbcl;Lbry;)Lhr; + ARG 0 world + ARG 1 chunk + METHOD a deserialize (Lbcl;Lceb;Lbby;Lhr;)Lbss; + ARG 0 world + ARG 1 structureManager + ARG 2 pos + ARG 3 tag + METHOD a readStructureStarts (Lbrz;Lceb;Lbdl;Lhr;)Ljava/util/Map; + ARG 0 chunkGenerator + ARG 1 structureManager + ARG 2 biomeSource + ARG 3 tag + METHOD a getChunkType (Lhr;)Lbsd$b; + ARG 0 tag + METHOD a writeEntities (Lhr;Lbsk;)V + ARG 0 tag + ARG 1 chunk + METHOD a toNbt ([Lit/unimi/dsi/fastutil/shorts/ShortList;)Lhx; + ARG 0 lists + METHOD b readStructureReferences (Lhr;)Ljava/util/Map; + ARG 0 tag diff --git a/mappings/net/minecraft/world/World.mapping b/mappings/net/minecraft/world/World.mapping index c6d2d87bf1..9b3a7cd0a0 100644 --- a/mappings/net/minecraft/world/World.mapping +++ b/mappings/net/minecraft/world/World.mapping @@ -149,6 +149,10 @@ CLASS bcl net/minecraft/world/World METHOD a getEntities (Ljava/lang/Class;Ljava/util/function/Predicate;)Ljava/util/List; ARG 1 entityClass METHOD a locateStructure (Ljava/lang/String;Let;IZ)Let; + ARG 1 id + ARG 2 center + ARG 3 radius + ARG 4 skipExistingChunks METHOD a addBlockEntities (Ljava/util/Collection;)V METHOD a getEntityByUuid (Ljava/util/UUID;)Lahc; METHOD a tick (Ljava/util/function/BooleanSupplier;)V diff --git a/mappings/net/minecraft/world/chunk/ChunkPos.mapping b/mappings/net/minecraft/world/chunk/ChunkPos.mapping index 961c758f7e..48ae4dfbdc 100644 --- a/mappings/net/minecraft/world/chunk/ChunkPos.mapping +++ b/mappings/net/minecraft/world/chunk/ChunkPos.mapping @@ -4,18 +4,31 @@ CLASS bby net/minecraft/world/chunk/ChunkPos FIELD c z I METHOD (II)V ARG 1 x + ARG 2 z + METHOD (J)V + ARG 1 pos + METHOD (Let;)V + ARG 1 pos METHOD a toLong ()J METHOD a toLong (II)J ARG 0 chunkX ARG 1 chunkZ METHOD a toBlockPos (III)Let; - ARG 1 xOffset - ARG 2 y - METHOD a longX (J)I - METHOD b longZ (J)I + ARG 1 chunkRelativeX + ARG 2 chunkRelativeY + ARG 3 chunkRelativeZ + METHOD a getPackedX (J)I + ARG 0 pos + METHOD b getPackedZ (J)I + ARG 0 pos METHOD d getXStart ()I METHOD e getZStart ()I METHOD equals (Ljava/lang/Object;)Z ARG 1 o METHOD f getXEnd ()I METHOD g getZEnd ()I + METHOD h getRegionX ()I + METHOD i getRegionZ ()I + METHOD j getRegionRelativeX ()I + METHOD k getRegionRelativeZ ()I + METHOD l getCenterBlockPos ()Let; diff --git a/mappings/net/minecraft/world/chunk/storage/RegionFile.mapping b/mappings/net/minecraft/world/chunk/storage/RegionFile.mapping index cc80c3e40b..f0d8326d5d 100644 --- a/mappings/net/minecraft/world/chunk/storage/RegionFile.mapping +++ b/mappings/net/minecraft/world/chunk/storage/RegionFile.mapping @@ -1,5 +1,6 @@ CLASS bsz net/minecraft/world/chunk/storage/RegionFile CLASS bsz$a ChunkBuffer + FIELD b pos Lbby; FIELD a EMPTY_SECTOR [B FIELD b file Ljava/io/RandomAccessFile; FIELD c offsets [I @@ -9,9 +10,14 @@ CLASS bsz net/minecraft/world/chunk/storage/RegionFile ARG 1 sectorNumber ARG 2 data METHOD a getChunkDataInputStream (Lbby;)Ljava/io/DataInputStream; + ARG 1 pos METHOD a setOffset (Lbby;I)V METHOD a write (Lbby;[BI)V METHOD b setTimestamp (Lbby;I)V METHOD c getChunkDataOutputStream (Lbby;)Ljava/io/DataOutputStream; METHOD d hasChunk (Lbby;)Z + ARG 1 pos METHOD e getOffset (Lbby;)I + ARG 1 pos + METHOD f getPackedRegionRelativePosition (Lbby;)I + ARG 1 pos diff --git a/mappings/net/minecraft/world/chunk/storage/RegionFileCache.mapping b/mappings/net/minecraft/world/chunk/storage/RegionFileCache.mapping index 77c0c4d0ae..7960ecc43b 100644 --- a/mappings/net/minecraft/world/chunk/storage/RegionFileCache.mapping +++ b/mappings/net/minecraft/world/chunk/storage/RegionFileCache.mapping @@ -1,2 +1,10 @@ CLASS bta net/minecraft/world/chunk/storage/RegionFileCache + FIELD d cachedRegionFiles Lit/unimi/dsi/fastutil/longs/Long2ObjectLinkedOpenHashMap; METHOD a getRegionFile (Lbby;)Lbsz; + ARG 1 pos + METHOD a setChunkTag (Lbby;Lhr;)V + ARG 1 pos + ARG 2 tag + METHOD c getChunkTag (Lbby;)Lhr; + ARG 1 pos + METHOD g getRegionDir ()Ljava/io/File; diff --git a/mappings/net/minecraft/world/gen/ChunkRandom.mapping b/mappings/net/minecraft/world/gen/ChunkRandom.mapping index 4f818a6ea6..b65293430c 100644 --- a/mappings/net/minecraft/world/gen/ChunkRandom.mapping +++ b/mappings/net/minecraft/world/gen/ChunkRandom.mapping @@ -7,7 +7,7 @@ CLASS bua net/minecraft/world/gen/ChunkRandom METHOD a setSeed (II)J ARG 1 x ARG 2 z - METHOD a (IIJJ)Ljava/util/Random; + METHOD a create (IIJJ)Ljava/util/Random; ARG 0 x ARG 1 z ARG 2 worldSeed diff --git a/mappings/net/minecraft/world/gen/chunk/ChunkGenerator.mapping b/mappings/net/minecraft/world/gen/chunk/ChunkGenerator.mapping index 26fef288a7..f86ef1cef3 100644 --- a/mappings/net/minecraft/world/gen/chunk/ChunkGenerator.mapping +++ b/mappings/net/minecraft/world/gen/chunk/ChunkGenerator.mapping @@ -15,9 +15,10 @@ CLASS brz net/minecraft/world/gen/chunk/ChunkGenerator METHOD a getEntitySpawnList (Lahn;Let;)Ljava/util/List; METHOD a locateStructure (Lbcl;Ljava/lang/String;Let;IZ)Let; ARG 1 world - ARG 2 structureKey - ARG 3 origin + ARG 2 id + ARG 3 center ARG 4 radius + ARG 5 skipExistingChunks METHOD a spawnEntities (Lbcl;ZZ)V ARG 1 world ARG 2 spawnMonsters diff --git a/mappings/net/minecraft/world/gen/feature/BuriedTreasureFeature.mapping b/mappings/net/minecraft/world/gen/feature/BuriedTreasureFeature.mapping index 43631f2d8a..54f522270f 100644 --- a/mappings/net/minecraft/world/gen/feature/BuriedTreasureFeature.mapping +++ b/mappings/net/minecraft/world/gen/feature/BuriedTreasureFeature.mapping @@ -1,5 +1,5 @@ CLASS buv net/minecraft/world/gen/feature/BuriedTreasureFeature - CLASS buv$a + CLASS buv$a Start METHOD (Lbzh;IILbdj;Lcco;IJ)V ARG 2 chunkX ARG 3 chunkZ diff --git a/mappings/net/minecraft/world/gen/feature/OceanRuinFeature.mapping b/mappings/net/minecraft/world/gen/feature/OceanRuinFeature.mapping index 1d20542d3b..12dd773156 100644 --- a/mappings/net/minecraft/world/gen/feature/OceanRuinFeature.mapping +++ b/mappings/net/minecraft/world/gen/feature/OceanRuinFeature.mapping @@ -3,7 +3,7 @@ CLASS ccy net/minecraft/world/gen/feature/OceanRuinFeature METHOD (Lbzh;IILbdj;Lcco;IJ)V ARG 2 chunkX ARG 3 chunkZ - CLASS ccy$b BiomeTemperature + CLASS ccy$b BiomeType FIELD a WARM Lccy$b; FIELD b COLD Lccy$b; FIELD c nameMap Ljava/util/Map; diff --git a/mappings/net/minecraft/world/gen/feature/OceanRuinFeatureConfig.mapping b/mappings/net/minecraft/world/gen/feature/OceanRuinFeatureConfig.mapping index 9983a3cdf8..d0b3d0bbe0 100644 --- a/mappings/net/minecraft/world/gen/feature/OceanRuinFeatureConfig.mapping +++ b/mappings/net/minecraft/world/gen/feature/OceanRuinFeatureConfig.mapping @@ -1,9 +1,9 @@ CLASS bxs net/minecraft/world/gen/feature/OceanRuinFeatureConfig - FIELD a biomeTemperature Lccy$b; + FIELD a biomeType Lccy$b; FIELD b largeProbability F FIELD c clusterProbability F METHOD (Lccy$b;FF)V - ARG 1 biomeTemperature + ARG 1 biomeType ARG 2 largeProbability ARG 3 clusterProbability METHOD a deserialize (Lcom/mojang/datafixers/Dynamic;)Lbxs; diff --git a/mappings/net/minecraft/world/gen/feature/StructureFeature.mapping b/mappings/net/minecraft/world/gen/feature/StructureFeature.mapping index b86dd0a4e4..ed9a2f17f3 100644 --- a/mappings/net/minecraft/world/gen/feature/StructureFeature.mapping +++ b/mappings/net/minecraft/world/gen/feature/StructureFeature.mapping @@ -1,6 +1,20 @@ CLASS bzh net/minecraft/world/gen/feature/StructureFeature + CLASS bzh$a StructureStartFactory + METHOD create (Lbzh;IILbdj;Lcco;IJ)Lcdi; + ARG 1 feature + ARG 2 x + ARG 3 z + ARG 4 biome + ARG 5 bounds FIELD a LOGGER Lorg/apache/logging/log4j/Logger; METHOD (Ljava/util/function/Function;)V ARG 1 configFactory + METHOD a getStructureStartFactory ()Lbzh$a; METHOD a locateStructure (Lbcl;Lbrz;Let;IZ)Let; + ARG 5 skipExistingChunks + METHOD a shouldStartAt (Lbrz;Ljava/util/Random;II)Z + ARG 1 chunkGenerator + ARG 2 random + ARG 3 chunkX + ARG 4 chunkZ METHOD b getName ()Ljava/lang/String; diff --git a/mappings/net/minecraft/world/gen/feature/StructureFeatures.mapping b/mappings/net/minecraft/world/gen/feature/StructureFeatures.mapping index 7cdcc61afc..05b07ae1ad 100644 --- a/mappings/net/minecraft/world/gen/feature/StructureFeatures.mapping +++ b/mappings/net/minecraft/world/gen/feature/StructureFeatures.mapping @@ -1,3 +1,19 @@ CLASS cdf net/minecraft/world/gen/feature/StructureFeatures - FIELD p logger Lorg/apache/logging/log4j/Logger; - METHOD a registerStructure (Ljava/lang/String;Lbzh;)Lbzh; + FIELD a MINESHAFT Lbzh; + FIELD b PILLAGER_OUTPOST Lbzh; + FIELD c FORTRESS Lbzh; + FIELD d STRONGHOLD Lbzh; + FIELD e JUNGLE_PYRAMID Lbzh; + FIELD f OCEAN_RUIN Lbzh; + FIELD g DESERT_PYRAMID Lbzh; + FIELD h IGLOO Lbzh; + FIELD i SWAMP_HUT Lbzh; + FIELD j MONUMENT Lbzh; + FIELD k END_CITY Lbzh; + FIELD l MANSION Lbzh; + FIELD m BURIED_TREASURE Lbzh; + FIELD n SHIPWRECK Lbzh; + FIELD o VILLAGE Lbzh; + FIELD p LOGGER Lorg/apache/logging/log4j/Logger; + METHOD a initialize ()V + METHOD a register (Ljava/lang/String;Lbzh;)Lbzh; diff --git a/mappings/net/minecraft/world/gen/features/village/DesertVillageData.mapping b/mappings/net/minecraft/world/gen/features/village/DesertVillageData.mapping deleted file mode 100644 index 6b4e4fb231..0000000000 --- a/mappings/net/minecraft/world/gen/features/village/DesertVillageData.mapping +++ /dev/null @@ -1 +0,0 @@ -CLASS bvs net/minecraft/world/gen/features/village/DesertVillageData diff --git a/mappings/net/minecraft/world/gen/features/village/PillagerVillageData.mapping b/mappings/net/minecraft/world/gen/features/village/PillagerVillageData.mapping deleted file mode 100644 index 06116db894..0000000000 --- a/mappings/net/minecraft/world/gen/features/village/PillagerVillageData.mapping +++ /dev/null @@ -1 +0,0 @@ -CLASS cda net/minecraft/world/gen/features/village/PillagerVillageData diff --git a/mappings/net/minecraft/world/gen/features/village/PlainsVillageData.mapping b/mappings/net/minecraft/world/gen/features/village/PlainsVillageData.mapping deleted file mode 100644 index 19559db961..0000000000 --- a/mappings/net/minecraft/world/gen/features/village/PlainsVillageData.mapping +++ /dev/null @@ -1 +0,0 @@ -CLASS bxz net/minecraft/world/gen/features/village/PlainsVillageData diff --git a/mappings/net/minecraft/world/gen/features/village/SavannaVillageData.mapping b/mappings/net/minecraft/world/gen/features/village/SavannaVillageData.mapping deleted file mode 100644 index b7affe7d9c..0000000000 --- a/mappings/net/minecraft/world/gen/features/village/SavannaVillageData.mapping +++ /dev/null @@ -1 +0,0 @@ -CLASS byn net/minecraft/world/gen/features/village/SavannaVillageData diff --git a/mappings/net/minecraft/world/gen/features/village/SnowyVillageData.mapping b/mappings/net/minecraft/world/gen/features/village/SnowyVillageData.mapping deleted file mode 100644 index f4aff95c3f..0000000000 --- a/mappings/net/minecraft/world/gen/features/village/SnowyVillageData.mapping +++ /dev/null @@ -1 +0,0 @@ -CLASS bza net/minecraft/world/gen/features/village/SnowyVillageData diff --git a/mappings/net/minecraft/world/gen/features/village/TaigaVillageData.mapping b/mappings/net/minecraft/world/gen/features/village/TaigaVillageData.mapping deleted file mode 100644 index eaa93b48c6..0000000000 --- a/mappings/net/minecraft/world/gen/features/village/TaigaVillageData.mapping +++ /dev/null @@ -1 +0,0 @@ -CLASS bzn net/minecraft/world/gen/features/village/TaigaVillageData