From eb2bbb15aec5279fd9e5ae551b30cbf2520e3832 Mon Sep 17 00:00:00 2001 From: apple502j <33279053+apple502j@users.noreply.github.com> Date: Thu, 2 Jun 2022 00:07:00 +0900 Subject: [PATCH] Rename Structure and StructureType (#3183) * Rename Structure and StructureType Structures really need a revisit. In my opinion the net.minecraft.structure package should be gone and everything should be moved to net.minecraft.world.gen.structure. That'd be a very big change, though. This commit basically reverts the entirety of #3079 and contains the changes necessary to keep consistency (but not other new changes). I could make it bigger, but this needs an ASAP merge to stop the bad names from going to the release. Summary of the renames: - `structure.Structure` became `structure.StructureTemplate`. See `/place template`, datafixes, etc. - `structure.StructureType` became `world.gen.structure.StructureType`. - `world.gen.structure.StructureType` became `world.gen.structure.Structure`. - `world.gen.structure.StructureTypes` became `world.gen.structure.Structures`. - Other names referencing the renamed classes by their old name - And missed "feature" renames (Fixes #3179) * Rename StructureManager * merging gone wrong Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> --- .../entity/StructureBlockBlockEntity.mapping | 14 +-- .../argument/RegistryKeyArgumentType.mapping | 2 +- ...figuredStructureFeatureTagProvider.mapping | 3 - .../data/server/StructureTagProvider.mapping | 3 + .../UpdateStructureBlockC2SPacket.mapping | 6 +- .../minecraft/server/MinecraftServer.mapping | 4 +- .../server/command/LocateCommand.mapping | 4 +- .../server/command/PlaceCommand.mapping | 2 +- .../server/command/TestCommand.mapping | 6 +- .../server/world/ServerChunkManager.mapping | 2 +- .../server/world/ServerWorld.mapping | 2 +- .../world/ThreadedAnvilChunkStorage.mapping | 4 +- .../structure/EndCityGenerator.mapping | 4 +- .../structure/OceanRuinGenerator.mapping | 2 +- .../structure/PoolStructurePiece.mapping | 4 +- .../RuinedPortalStructurePiece.mapping | 2 +- .../structure/ShipwreckGenerator.mapping | 2 +- .../structure/SimpleStructurePiece.mapping | 9 +- .../StructureGeneratorFactory.mapping | 2 - .../structure/StructurePieceType.mapping | 2 +- .../minecraft/structure/StructureSets.mapping | 2 +- .../structure/StructureStart.mapping | 6 +- ...ture.mapping => StructureTemplate.mapping} | 2 +- ...pping => StructureTemplateManager.mapping} | 52 ++++---- .../minecraft/structure/StructureType.mapping | 4 - .../structure/pool/SinglePoolElement.mapping | 6 +- .../structure/pool/StructurePool.mapping | 2 +- .../pool/StructurePoolBasedGenerator.mapping | 6 +- .../pool/StructurePoolElement.mapping | 8 +- ...tureTags.mapping => StructureTags.mapping} | 2 +- mappings/net/minecraft/test/GameTest.mapping | 2 +- .../net/minecraft/test/GameTestState.mapping | 4 +- .../minecraft/test/StructureTestUtil.mapping | 12 +- .../net/minecraft/test/TestFunction.mapping | 20 ++-- .../minecraft/world/StructureHolder.mapping | 8 +- .../minecraft/world/StructureLocator.mapping | 24 ++-- .../minecraft/world/chunk/ChunkStatus.mapping | 30 ++--- .../world/gen/StructureAccessor.mapping | 18 +-- .../world/gen/chunk/ChunkGenerator.mapping | 2 +- .../world/gen/structure/Structure.mapping | 105 +++++++++++++++++ ...TypeKeys.mapping => StructureKeys.mapping} | 2 +- .../world/gen/structure/StructureType.mapping | 111 +----------------- ...uctureTypes.mapping => Structures.mapping} | 4 +- 43 files changed, 254 insertions(+), 257 deletions(-) delete mode 100644 mappings/net/minecraft/data/server/ConfiguredStructureFeatureTagProvider.mapping create mode 100644 mappings/net/minecraft/data/server/StructureTagProvider.mapping rename mappings/net/minecraft/structure/{Structure.mapping => StructureTemplate.mapping} (99%) rename mappings/net/minecraft/structure/{StructureManager.mapping => StructureTemplateManager.mapping} (51%) delete mode 100644 mappings/net/minecraft/structure/StructureType.mapping rename mappings/net/minecraft/tag/{ConfiguredStructureFeatureTags.mapping => StructureTags.mapping} (50%) create mode 100644 mappings/net/minecraft/world/gen/structure/Structure.mapping rename mappings/net/minecraft/world/gen/structure/{StructureTypeKeys.mapping => StructureKeys.mapping} (88%) rename mappings/net/minecraft/world/gen/structure/{StructureTypes.mapping => Structures.mapping} (98%) diff --git a/mappings/net/minecraft/block/entity/StructureBlockBlockEntity.mapping b/mappings/net/minecraft/block/entity/StructureBlockBlockEntity.mapping index ddf603fc78..91600ab25d 100644 --- a/mappings/net/minecraft/block/entity/StructureBlockBlockEntity.mapping +++ b/mappings/net/minecraft/block/entity/StructureBlockBlockEntity.mapping @@ -9,7 +9,7 @@ CLASS net/minecraft/class_2633 net/minecraft/block/entity/StructureBlockBlockEnt FIELD field_12099 ignoreEntities Z FIELD field_12100 size Lnet/minecraft/class_2382; FIELD field_12101 integrity F - FIELD field_12102 structureName Lnet/minecraft/class_2960; + FIELD field_12102 templateName Lnet/minecraft/class_2960; FIELD field_12103 seed J FIELD field_12104 author Ljava/lang/String; FIELD field_12105 rotation Lnet/minecraft/class_2470; @@ -17,10 +17,10 @@ CLASS net/minecraft/class_2633 net/minecraft/block/entity/StructureBlockBlockEnt METHOD (Lnet/minecraft/class_2338;Lnet/minecraft/class_2680;)V ARG 1 pos ARG 2 state - METHOD method_11343 setStructureName (Ljava/lang/String;)V - ARG 1 name - METHOD method_11344 setStructureName (Lnet/minecraft/class_2960;)V - ARG 1 structureName + METHOD method_11343 setTemplateName (Ljava/lang/String;)V + ARG 1 templateName + METHOD method_11344 setTemplateName (Lnet/minecraft/class_2960;)V + ARG 1 templateName METHOD method_11345 getMirror ()Lnet/minecraft/class_2415; METHOD method_11346 getIntegrity ()F METHOD method_11347 setShowAir (Z)V @@ -41,7 +41,7 @@ CLASS net/minecraft/class_2633 net/minecraft/block/entity/StructureBlockBlockEnt METHOD method_11360 setShowBoundingBox (Z)V ARG 1 showBoundingBox METHOD method_11361 unloadStructure ()V - METHOD method_11362 getStructureName ()Ljava/lang/String; + METHOD method_11362 getTemplateName ()Ljava/lang/String; METHOD method_11363 setMetadata (Ljava/lang/String;)V ARG 1 metadata METHOD method_11365 saveStructure ()Z @@ -77,7 +77,7 @@ CLASS net/minecraft/class_2633 net/minecraft/block/entity/StructureBlockBlockEnt ARG 0 seed METHOD method_21864 place (Lnet/minecraft/class_3218;ZLnet/minecraft/class_3499;)Z ARG 1 world - ARG 3 structure + ARG 3 template METHOD method_21865 getStructurePath ()Ljava/lang/String; METHOD method_34273 (Lnet/minecraft/class_2586;)Lnet/minecraft/class_2633; ARG 0 blockEntity diff --git a/mappings/net/minecraft/command/argument/RegistryKeyArgumentType.mapping b/mappings/net/minecraft/command/argument/RegistryKeyArgumentType.mapping index 36630d3d7d..1556f48f67 100644 --- a/mappings/net/minecraft/command/argument/RegistryKeyArgumentType.mapping +++ b/mappings/net/minecraft/command/argument/RegistryKeyArgumentType.mapping @@ -39,7 +39,7 @@ CLASS net/minecraft/class_7079 net/minecraft/command/argument/RegistryKeyArgumen ARG 3 invalidException METHOD method_43778 (Ljava/lang/Object;)Lcom/mojang/brigadier/Message; ARG 0 id - METHOD method_43779 getStructureTypeEntry (Lcom/mojang/brigadier/context/CommandContext;Ljava/lang/String;)Lnet/minecraft/class_6880; + METHOD method_43779 getStructureEntry (Lcom/mojang/brigadier/context/CommandContext;Ljava/lang/String;)Lnet/minecraft/class_6880; ARG 0 context ARG 1 name METHOD method_43780 getStructurePoolEntry (Lcom/mojang/brigadier/context/CommandContext;Ljava/lang/String;)Lnet/minecraft/class_6880; diff --git a/mappings/net/minecraft/data/server/ConfiguredStructureFeatureTagProvider.mapping b/mappings/net/minecraft/data/server/ConfiguredStructureFeatureTagProvider.mapping deleted file mode 100644 index 659d0d918f..0000000000 --- a/mappings/net/minecraft/data/server/ConfiguredStructureFeatureTagProvider.mapping +++ /dev/null @@ -1,3 +0,0 @@ -CLASS net/minecraft/class_7071 net/minecraft/data/server/ConfiguredStructureFeatureTagProvider - METHOD (Lnet/minecraft/class_2403;)V - ARG 1 dataGenerator diff --git a/mappings/net/minecraft/data/server/StructureTagProvider.mapping b/mappings/net/minecraft/data/server/StructureTagProvider.mapping new file mode 100644 index 0000000000..a2027fd8ef --- /dev/null +++ b/mappings/net/minecraft/data/server/StructureTagProvider.mapping @@ -0,0 +1,3 @@ +CLASS net/minecraft/class_7071 net/minecraft/data/server/StructureTagProvider + METHOD (Lnet/minecraft/class_2403;)V + ARG 1 dataGenerator diff --git a/mappings/net/minecraft/network/packet/c2s/play/UpdateStructureBlockC2SPacket.mapping b/mappings/net/minecraft/network/packet/c2s/play/UpdateStructureBlockC2SPacket.mapping index 445d009dc3..13bcf3a4e0 100644 --- a/mappings/net/minecraft/network/packet/c2s/play/UpdateStructureBlockC2SPacket.mapping +++ b/mappings/net/minecraft/network/packet/c2s/play/UpdateStructureBlockC2SPacket.mapping @@ -1,5 +1,5 @@ CLASS net/minecraft/class_2875 net/minecraft/network/packet/c2s/play/UpdateStructureBlockC2SPacket - FIELD field_13080 structureName Ljava/lang/String; + FIELD field_13080 templateName Ljava/lang/String; FIELD field_13081 mirror Lnet/minecraft/class_2415; FIELD field_13082 action Lnet/minecraft/class_2633$class_2634; FIELD field_13083 size Lnet/minecraft/class_2382; @@ -20,7 +20,7 @@ CLASS net/minecraft/class_2875 net/minecraft/network/packet/c2s/play/UpdateStruc ARG 1 pos ARG 2 action ARG 3 mode - ARG 4 structureName + ARG 4 templateName ARG 5 offset ARG 6 size ARG 7 mirror @@ -42,7 +42,7 @@ CLASS net/minecraft/class_2875 net/minecraft/network/packet/c2s/play/UpdateStruc METHOD method_12499 getPos ()Lnet/minecraft/class_2338; METHOD method_12500 getAction ()Lnet/minecraft/class_2633$class_2634; METHOD method_12501 getMetadata ()Ljava/lang/String; - METHOD method_12502 getStructureName ()Ljava/lang/String; + METHOD method_12502 getTemplateName ()Ljava/lang/String; METHOD method_12503 shouldShowAir ()Z METHOD method_12504 getMode ()Lnet/minecraft/class_2776; METHOD method_12505 shouldShowBoundingBox ()Z diff --git a/mappings/net/minecraft/server/MinecraftServer.mapping b/mappings/net/minecraft/server/MinecraftServer.mapping index d49fb40d44..1c991319f9 100644 --- a/mappings/net/minecraft/server/MinecraftServer.mapping +++ b/mappings/net/minecraft/server/MinecraftServer.mapping @@ -27,7 +27,7 @@ CLASS net/minecraft/server/MinecraftServer FIELD field_20850 dataCommandStorage Lnet/minecraft/class_4565; FIELD field_22250 recorder Lnet/minecraft/class_5962; FIELD field_23784 session Lnet/minecraft/class_32$class_5143; - FIELD field_24370 structureManager Lnet/minecraft/class_3485; + FIELD field_24370 structureTemplateManager Lnet/minecraft/class_3485; FIELD field_24371 saveHandler Lnet/minecraft/class_29; FIELD field_24372 saveProperties Lnet/minecraft/class_5219; FIELD field_25132 registryManager Lnet/minecraft/class_5455$class_6890; @@ -127,7 +127,7 @@ CLASS net/minecraft/server/MinecraftServer METHOD method_27050 getSavePath (Lnet/minecraft/class_5218;)Ljava/nio/file/Path; ARG 1 worldSavePath METHOD method_27051 syncChunkWrites ()Z - METHOD method_27727 getStructureManager ()Lnet/minecraft/class_3485; + METHOD method_27727 getStructureTemplateManager ()Lnet/minecraft/class_3485; METHOD method_27728 getSaveProperties ()Lnet/minecraft/class_5219; METHOD method_27729 updateMobSpawnOptions ()V METHOD method_27731 updateDifficulty ()V diff --git a/mappings/net/minecraft/server/command/LocateCommand.mapping b/mappings/net/minecraft/server/command/LocateCommand.mapping index 90fe97d1ca..44d4a62b76 100644 --- a/mappings/net/minecraft/server/command/LocateCommand.mapping +++ b/mappings/net/minecraft/server/command/LocateCommand.mapping @@ -16,7 +16,7 @@ CLASS net/minecraft/class_3079 net/minecraft/server/command/LocateCommand ARG 0 source METHOD method_24499 sendCoordinates (Lnet/minecraft/class_2168;Lnet/minecraft/class_7066$class_7068;Lnet/minecraft/class_2338;Lcom/mojang/datafixers/util/Pair;Ljava/lang/String;Z)I ARG 0 source - ARG 1 structureFeature + ARG 1 structure ARG 2 currentPos ARG 3 structurePosAndEntry ARG 4 successMessage @@ -35,7 +35,7 @@ CLASS net/minecraft/class_3079 net/minecraft/server/command/LocateCommand ARG 1 predicate METHOD method_43907 getStructureListForPredicate (Lnet/minecraft/class_7066$class_7068;Lnet/minecraft/class_2378;)Ljava/util/Optional; ARG 0 predicate - ARG 1 structureTypeRegistry + ARG 1 structureRegistry METHOD method_43908 (Lnet/minecraft/class_6880;)Lnet/minecraft/class_6885$class_6886; ARG 0 entry METHOD method_43909 (Lnet/minecraft/class_2378;Lnet/minecraft/class_5321;)Ljava/util/Optional; diff --git a/mappings/net/minecraft/server/command/PlaceCommand.mapping b/mappings/net/minecraft/server/command/PlaceCommand.mapping index 1686f4580f..b3f4a4782a 100644 --- a/mappings/net/minecraft/server/command/PlaceCommand.mapping +++ b/mappings/net/minecraft/server/command/PlaceCommand.mapping @@ -41,7 +41,7 @@ CLASS net/minecraft/class_6852 net/minecraft/server/command/PlaceCommand ARG 0 context METHOD method_43654 executePlaceStructure (Lnet/minecraft/class_2168;Lnet/minecraft/class_6880;Lnet/minecraft/class_2338;)I ARG 0 source - ARG 1 structureType + ARG 1 structure ARG 2 pos METHOD method_43655 (Lcom/mojang/brigadier/context/CommandContext;)I ARG 0 context diff --git a/mappings/net/minecraft/server/command/TestCommand.mapping b/mappings/net/minecraft/server/command/TestCommand.mapping index b193db97ec..0bb248ca40 100644 --- a/mappings/net/minecraft/server/command/TestCommand.mapping +++ b/mappings/net/minecraft/server/command/TestCommand.mapping @@ -18,7 +18,7 @@ CLASS net/minecraft/class_4527 net/minecraft/server/command/TestCommand ARG 3 sizeZ METHOD method_22268 executeCreate (Lnet/minecraft/class_2168;Ljava/lang/String;III)I ARG 0 source - ARG 1 structure + ARG 1 testName ARG 2 x ARG 3 y ARG 4 z @@ -56,7 +56,7 @@ CLASS net/minecraft/class_4527 net/minecraft/server/command/TestCommand ARG 0 source METHOD method_22282 executeExport (Lnet/minecraft/class_2168;Ljava/lang/String;)I ARG 0 source - ARG 1 structure + ARG 1 testName METHOD method_22283 (Lcom/mojang/brigadier/context/CommandContext;)I ARG 0 context METHOD method_22284 executeRunAll (Lnet/minecraft/class_2168;II)I @@ -65,7 +65,7 @@ CLASS net/minecraft/class_4527 net/minecraft/server/command/TestCommand ARG 2 sizeZ METHOD method_22285 executeImport (Lnet/minecraft/class_2168;Ljava/lang/String;)I ARG 0 source - ARG 1 structure + ARG 1 testName METHOD method_22286 (Lcom/mojang/brigadier/context/CommandContext;)I ARG 0 context METHOD method_22287 (Lcom/mojang/brigadier/context/CommandContext;)I diff --git a/mappings/net/minecraft/server/world/ServerChunkManager.mapping b/mappings/net/minecraft/server/world/ServerChunkManager.mapping index 0babe72f4e..2d7ca3d488 100644 --- a/mappings/net/minecraft/server/world/ServerChunkManager.mapping +++ b/mappings/net/minecraft/server/world/ServerChunkManager.mapping @@ -19,7 +19,7 @@ CLASS net/minecraft/class_3215 net/minecraft/server/world/ServerChunkManager ARG 1 world ARG 2 session ARG 3 dataFixer - ARG 4 structureManager + ARG 4 structureTemplateManager ARG 5 workerExecutor ARG 6 chunkGenerator ARG 7 viewDistance diff --git a/mappings/net/minecraft/server/world/ServerWorld.mapping b/mappings/net/minecraft/server/world/ServerWorld.mapping index 59786dccb9..c9259396ce 100644 --- a/mappings/net/minecraft/server/world/ServerWorld.mapping +++ b/mappings/net/minecraft/server/world/ServerWorld.mapping @@ -77,7 +77,7 @@ CLASS net/minecraft/class_3218 net/minecraft/server/world/ServerWorld ARG 3 savingDisabled COMMENT whether to return early without doing anything METHOD method_14177 isInBlockTick ()Z - METHOD method_14183 getStructureManager ()Lnet/minecraft/class_3485; + METHOD method_14183 getStructureTemplateManager ()Lnet/minecraft/class_3485; METHOD method_14188 saveLevel ()V METHOD method_14189 tickBlock (Lnet/minecraft/class_2338;Lnet/minecraft/class_2248;)V ARG 1 pos diff --git a/mappings/net/minecraft/server/world/ThreadedAnvilChunkStorage.mapping b/mappings/net/minecraft/server/world/ThreadedAnvilChunkStorage.mapping index d3d7d90828..cab8326313 100644 --- a/mappings/net/minecraft/server/world/ThreadedAnvilChunkStorage.mapping +++ b/mappings/net/minecraft/server/world/ThreadedAnvilChunkStorage.mapping @@ -15,7 +15,7 @@ CLASS net/minecraft/class_3898 net/minecraft/server/world/ThreadedAnvilChunkStor FIELD field_17230 totalChunksLoadedCount Ljava/util/concurrent/atomic/AtomicInteger; FIELD field_17442 worldGenerationProgressListener Lnet/minecraft/class_3949; FIELD field_17705 persistentStateManagerFactory Ljava/util/function/Supplier; - FIELD field_17706 structureManager Lnet/minecraft/class_3485; + FIELD field_17706 structureTemplateManager Lnet/minecraft/class_3485; FIELD field_17707 saveDir Ljava/lang/String; FIELD field_18239 MAX_LEVEL I COMMENT Specifies the maximum ticket level a chunk can be before a chunk's {@link net.minecraft.server.world.ChunkHolder.LevelType} is {@link net.minecraft.server.world.ChunkHolder.LevelType#BORDER}. @@ -37,7 +37,7 @@ CLASS net/minecraft/class_3898 net/minecraft/server/world/ThreadedAnvilChunkStor ARG 1 world ARG 2 session ARG 3 dataFixer - ARG 4 structureManager + ARG 4 structureTemplateManager ARG 5 executor ARG 6 mainThreadExecutor ARG 7 chunkProvider diff --git a/mappings/net/minecraft/structure/EndCityGenerator.mapping b/mappings/net/minecraft/structure/EndCityGenerator.mapping index 1d56b8066c..1c49e0afa7 100644 --- a/mappings/net/minecraft/structure/EndCityGenerator.mapping +++ b/mappings/net/minecraft/structure/EndCityGenerator.mapping @@ -15,7 +15,7 @@ CLASS net/minecraft/class_3342 net/minecraft/structure/EndCityGenerator ARG 5 pieces ARG 6 random METHOD method_14679 addPieces (Lnet/minecraft/class_3485;Lnet/minecraft/class_2338;Lnet/minecraft/class_2470;Ljava/util/List;Lnet/minecraft/class_5819;)V - ARG 0 structureManager + ARG 0 structureTemplateManager ARG 1 pos ARG 2 rotation ARG 3 pieces @@ -24,7 +24,7 @@ CLASS net/minecraft/class_3342 net/minecraft/structure/EndCityGenerator ARG 0 pieces ARG 1 piece METHOD method_14684 createPiece (Lnet/minecraft/class_3485;Lnet/minecraft/class_3342$class_3343;Lnet/minecraft/class_2338;Ljava/lang/String;Lnet/minecraft/class_2470;Z)Lnet/minecraft/class_3342$class_3343; - ARG 0 structureManager + ARG 0 structureTemplateManager ARG 1 lastPiece ARG 2 relativePosition ARG 3 template diff --git a/mappings/net/minecraft/structure/OceanRuinGenerator.mapping b/mappings/net/minecraft/structure/OceanRuinGenerator.mapping index 369720fa4c..7ee65124f4 100644 --- a/mappings/net/minecraft/structure/OceanRuinGenerator.mapping +++ b/mappings/net/minecraft/structure/OceanRuinGenerator.mapping @@ -41,7 +41,7 @@ CLASS net/minecraft/class_3409 net/minecraft/structure/OceanRuinGenerator ARG 1 holder ARG 2 nbt METHOD (Lnet/minecraft/class_3485;Lnet/minecraft/class_2960;Lnet/minecraft/class_2338;Lnet/minecraft/class_2470;FLnet/minecraft/class_3411$class_3413;Z)V - ARG 1 structureManager + ARG 1 structureTemplateManager ARG 2 template ARG 3 pos ARG 4 rotation diff --git a/mappings/net/minecraft/structure/PoolStructurePiece.mapping b/mappings/net/minecraft/structure/PoolStructurePiece.mapping index 5822a868a3..57ba41e0a5 100644 --- a/mappings/net/minecraft/structure/PoolStructurePiece.mapping +++ b/mappings/net/minecraft/structure/PoolStructurePiece.mapping @@ -4,10 +4,10 @@ CLASS net/minecraft/class_3790 net/minecraft/structure/PoolStructurePiece FIELD field_16694 rotation Lnet/minecraft/class_2470; FIELD field_16695 pos Lnet/minecraft/class_2338; FIELD field_16696 junctions Ljava/util/List; - FIELD field_17660 structureManager Lnet/minecraft/class_3485; + FIELD field_17660 structureTemplateManager Lnet/minecraft/class_3485; FIELD field_24991 LOGGER Lorg/slf4j/Logger; METHOD (Lnet/minecraft/class_3485;Lnet/minecraft/class_3784;Lnet/minecraft/class_2338;ILnet/minecraft/class_2470;Lnet/minecraft/class_3341;)V - ARG 1 structureManager + ARG 1 structureTemplateManager ARG 2 poolElement ARG 3 pos ARG 4 groundLevelDelta diff --git a/mappings/net/minecraft/structure/RuinedPortalStructurePiece.mapping b/mappings/net/minecraft/structure/RuinedPortalStructurePiece.mapping index 1d0cd08b70..d8b6c7fab7 100644 --- a/mappings/net/minecraft/structure/RuinedPortalStructurePiece.mapping +++ b/mappings/net/minecraft/structure/RuinedPortalStructurePiece.mapping @@ -7,7 +7,7 @@ CLASS net/minecraft/class_5189 net/minecraft/structure/RuinedPortalStructurePiec ARG 3 verticalPlacement ARG 4 properties ARG 5 id - ARG 6 structure + ARG 6 template ARG 7 rotation ARG 8 mirror METHOD (Lnet/minecraft/class_3485;Lnet/minecraft/class_2487;)V diff --git a/mappings/net/minecraft/structure/ShipwreckGenerator.mapping b/mappings/net/minecraft/structure/ShipwreckGenerator.mapping index 827118476a..2cded86477 100644 --- a/mappings/net/minecraft/structure/ShipwreckGenerator.mapping +++ b/mappings/net/minecraft/structure/ShipwreckGenerator.mapping @@ -4,7 +4,7 @@ CLASS net/minecraft/class_3415 net/minecraft/structure/ShipwreckGenerator FIELD field_14536 DEFAULT_POSITION Lnet/minecraft/class_2338; FIELD field_34939 LOOT_TABLES Ljava/util/Map; METHOD method_14834 addParts (Lnet/minecraft/class_3485;Lnet/minecraft/class_2338;Lnet/minecraft/class_2470;Lnet/minecraft/class_6130;Lnet/minecraft/class_5819;Z)V - ARG 0 structureManager + ARG 0 structureTemplateManager ARG 1 pos ARG 2 rotation ARG 3 holder diff --git a/mappings/net/minecraft/structure/SimpleStructurePiece.mapping b/mappings/net/minecraft/structure/SimpleStructurePiece.mapping index 2f4a209892..e9fe0f7537 100644 --- a/mappings/net/minecraft/structure/SimpleStructurePiece.mapping +++ b/mappings/net/minecraft/structure/SimpleStructurePiece.mapping @@ -1,13 +1,13 @@ CLASS net/minecraft/class_3470 net/minecraft/structure/SimpleStructurePiece FIELD field_15432 pos Lnet/minecraft/class_2338; - FIELD field_15433 structure Lnet/minecraft/class_3499; + FIELD field_15433 template Lnet/minecraft/class_3499; FIELD field_15434 placementData Lnet/minecraft/class_3492; FIELD field_16586 LOGGER Lorg/slf4j/Logger; - FIELD field_31664 template Ljava/lang/String; + FIELD field_31664 templateIdString Ljava/lang/String; METHOD (Lnet/minecraft/class_3773;ILnet/minecraft/class_3485;Lnet/minecraft/class_2960;Ljava/lang/String;Lnet/minecraft/class_3492;Lnet/minecraft/class_2338;)V ARG 1 type ARG 2 length - ARG 3 structureManager + ARG 3 structureTemplateManager ARG 4 id ARG 5 template ARG 6 placementData @@ -15,7 +15,7 @@ CLASS net/minecraft/class_3470 net/minecraft/structure/SimpleStructurePiece METHOD (Lnet/minecraft/class_3773;Lnet/minecraft/class_2487;Lnet/minecraft/class_3485;Ljava/util/function/Function;)V ARG 1 type ARG 2 nbt - ARG 3 structureManager + ARG 3 structureTemplateManager ARG 4 placementDataGetter METHOD method_15026 handleMetadata (Ljava/lang/String;Lnet/minecraft/class_2338;Lnet/minecraft/class_5425;Lnet/minecraft/class_5819;Lnet/minecraft/class_3341;)V ARG 1 metadata @@ -24,3 +24,4 @@ CLASS net/minecraft/class_3470 net/minecraft/structure/SimpleStructurePiece ARG 4 random ARG 5 boundingBox METHOD method_35470 getId ()Lnet/minecraft/class_2960; + METHOD method_41624 getTemplate ()Lnet/minecraft/class_3499; diff --git a/mappings/net/minecraft/structure/StructureGeneratorFactory.mapping b/mappings/net/minecraft/structure/StructureGeneratorFactory.mapping index e182b7fd9a..16a1faaaff 100644 --- a/mappings/net/minecraft/structure/StructureGeneratorFactory.mapping +++ b/mappings/net/minecraft/structure/StructureGeneratorFactory.mapping @@ -12,11 +12,9 @@ CLASS net/minecraft/class_6834 net/minecraft/structure/StructureGeneratorFactory ARG 1 generator CLASS class_6835 Context FIELD comp_311 world Lnet/minecraft/class_5539; - FIELD comp_313 structureManager Lnet/minecraft/class_3485; FIELD comp_314 registryManager Lnet/minecraft/class_5455; FIELD comp_573 noiseConfig Lnet/minecraft/class_7138; METHOD comp_311 world ()Lnet/minecraft/class_5539; - METHOD comp_313 structureManager ()Lnet/minecraft/class_3485; METHOD comp_314 registryManager ()Lnet/minecraft/class_5455; METHOD comp_573 noiseConfig ()Lnet/minecraft/class_7138; METHOD method_39848 isBiomeValid (Lnet/minecraft/class_2902$class_2903;)Z diff --git a/mappings/net/minecraft/structure/StructurePieceType.mapping b/mappings/net/minecraft/structure/StructurePieceType.mapping index 5c180d9df7..1f01790db5 100644 --- a/mappings/net/minecraft/structure/StructurePieceType.mapping +++ b/mappings/net/minecraft/structure/StructurePieceType.mapping @@ -71,5 +71,5 @@ CLASS net/minecraft/class_3773 net/minecraft/structure/StructurePieceType ARG 1 nbt CLASS class_6616 ManagerAware METHOD load (Lnet/minecraft/class_3485;Lnet/minecraft/class_2487;)Lnet/minecraft/class_3443; - ARG 1 structureManager + ARG 1 structureTemplateManager ARG 2 nbt diff --git a/mappings/net/minecraft/structure/StructureSets.mapping b/mappings/net/minecraft/structure/StructureSets.mapping index 60c30c0ff2..5fc7791a34 100644 --- a/mappings/net/minecraft/structure/StructureSets.mapping +++ b/mappings/net/minecraft/structure/StructureSets.mapping @@ -23,5 +23,5 @@ CLASS net/minecraft/class_7072 net/minecraft/structure/StructureSets ARG 1 structureSet METHOD method_41184 register (Lnet/minecraft/class_5321;Lnet/minecraft/class_6880;Lnet/minecraft/class_6874;)Lnet/minecraft/class_6880; ARG 0 key - ARG 1 configuredStructureFigure + ARG 1 structure ARG 2 placement diff --git a/mappings/net/minecraft/structure/StructureStart.mapping b/mappings/net/minecraft/structure/StructureStart.mapping index 3f87283460..dfb9919cea 100644 --- a/mappings/net/minecraft/structure/StructureStart.mapping +++ b/mappings/net/minecraft/structure/StructureStart.mapping @@ -11,14 +11,14 @@ CLASS net/minecraft/class_3449 net/minecraft/structure/StructureStart COMMENT is created in such chunks (when they enter the corresponding chunk generation COMMENT phase). FIELD field_16713 DEFAULT Lnet/minecraft/class_3449; - FIELD field_16714 feature Lnet/minecraft/class_3195; + FIELD field_16714 structure Lnet/minecraft/class_3195; FIELD field_29070 pos Lnet/minecraft/class_1923; FIELD field_31662 INVALID Ljava/lang/String; FIELD field_31663 boundingBox Lnet/minecraft/class_3341; FIELD field_34940 children Lnet/minecraft/class_6624; FIELD field_37751 LOGGER Lorg/slf4j/Logger; METHOD (Lnet/minecraft/class_3195;Lnet/minecraft/class_1923;ILnet/minecraft/class_6624;)V - ARG 1 feature + ARG 1 structure ARG 2 pos ARG 3 references ARG 4 children @@ -37,7 +37,7 @@ CLASS net/minecraft/class_3449 net/minecraft/structure/StructureStart ARG 5 chunkBox ARG 6 chunkPos METHOD method_14979 isNeverReferenced ()Z - METHOD method_16656 getFeature ()Lnet/minecraft/class_3195; + METHOD method_16656 getStructure ()Lnet/minecraft/class_3195; METHOD method_16657 hasChildren ()Z METHOD method_23676 getReferences ()I METHOD method_34000 getPos ()Lnet/minecraft/class_1923; diff --git a/mappings/net/minecraft/structure/Structure.mapping b/mappings/net/minecraft/structure/StructureTemplate.mapping similarity index 99% rename from mappings/net/minecraft/structure/Structure.mapping rename to mappings/net/minecraft/structure/StructureTemplate.mapping index 0d8d5f7582..246e1b0841 100644 --- a/mappings/net/minecraft/structure/Structure.mapping +++ b/mappings/net/minecraft/structure/StructureTemplate.mapping @@ -1,4 +1,4 @@ -CLASS net/minecraft/class_3499 net/minecraft/structure/Structure +CLASS net/minecraft/class_3499 net/minecraft/structure/StructureTemplate FIELD field_15586 blockInfoLists Ljava/util/List; FIELD field_15587 size Lnet/minecraft/class_2382; FIELD field_15588 author Ljava/lang/String; diff --git a/mappings/net/minecraft/structure/StructureManager.mapping b/mappings/net/minecraft/structure/StructureTemplateManager.mapping similarity index 51% rename from mappings/net/minecraft/structure/StructureManager.mapping rename to mappings/net/minecraft/structure/StructureTemplateManager.mapping index 7ea0f154e0..fa0ddb6215 100644 --- a/mappings/net/minecraft/structure/StructureManager.mapping +++ b/mappings/net/minecraft/structure/StructureTemplateManager.mapping @@ -1,6 +1,6 @@ -CLASS net/minecraft/class_3485 net/minecraft/structure/StructureManager +CLASS net/minecraft/class_3485 net/minecraft/structure/StructureTemplateManager FIELD field_15512 generatedPath Ljava/nio/file/Path; - FIELD field_15513 structures Ljava/util/Map; + FIELD field_15513 templates Ljava/util/Map; FIELD field_15514 LOGGER Lorg/slf4j/Logger; FIELD field_15515 dataFixer Lcom/mojang/datafixers/DataFixer; FIELD field_25189 resourceManager Lnet/minecraft/class_3300; @@ -13,44 +13,44 @@ CLASS net/minecraft/class_3485 net/minecraft/structure/StructureManager ARG 1 resourceManager ARG 2 session ARG 3 dataFixer - METHOD method_15085 getStructurePath (Ljava/nio/file/Path;Lnet/minecraft/class_2960;Ljava/lang/String;)Ljava/nio/file/Path; + METHOD method_15085 getTemplatePath (Ljava/nio/file/Path;Lnet/minecraft/class_2960;Ljava/lang/String;)Ljava/nio/file/Path; ARG 0 path ARG 1 id ARG 2 extension - METHOD method_15086 getAndCheckStructurePath (Ljava/nio/file/Path;Lnet/minecraft/class_2960;Ljava/lang/String;)Ljava/nio/file/Path; + METHOD method_15086 getAndCheckTemplatePath (Ljava/nio/file/Path;Lnet/minecraft/class_2960;Ljava/lang/String;)Ljava/nio/file/Path; ARG 0 path ARG 1 id ARG 2 extension - METHOD method_15087 unloadStructure (Lnet/minecraft/class_2960;)V + METHOD method_15087 unloadTemplate (Lnet/minecraft/class_2960;)V ARG 1 id - METHOD method_15088 loadStructureFromResource (Lnet/minecraft/class_2960;)Ljava/util/Optional; + METHOD method_15088 loadTemplateFromResource (Lnet/minecraft/class_2960;)Ljava/util/Optional; ARG 1 id - METHOD method_15090 readStructure (Ljava/io/InputStream;)Lnet/minecraft/class_3499; - ARG 1 structureInputStream - METHOD method_15091 getStructureOrBlank (Lnet/minecraft/class_2960;)Lnet/minecraft/class_3499; + METHOD method_15090 readTemplate (Ljava/io/InputStream;)Lnet/minecraft/class_3499; + ARG 1 templateIInputStream + METHOD method_15091 getTemplateOrBlank (Lnet/minecraft/class_2960;)Lnet/minecraft/class_3499; ARG 1 id - METHOD method_15092 loadStructureFromFile (Lnet/minecraft/class_2960;)Ljava/util/Optional; + METHOD method_15092 loadTemplateFromFile (Lnet/minecraft/class_2960;)Ljava/util/Optional; ARG 1 id - METHOD method_15093 saveStructure (Lnet/minecraft/class_2960;)Z + METHOD method_15093 saveTemplate (Lnet/minecraft/class_2960;)Z ARG 1 id - METHOD method_15094 getStructure (Lnet/minecraft/class_2960;)Ljava/util/Optional; + METHOD method_15094 getTemplate (Lnet/minecraft/class_2960;)Ljava/util/Optional; ARG 1 id - METHOD method_21891 createStructure (Lnet/minecraft/class_2487;)Lnet/minecraft/class_3499; + METHOD method_21891 createTemplate (Lnet/minecraft/class_2487;)Lnet/minecraft/class_3499; ARG 1 nbt METHOD method_29300 setResourceManager (Lnet/minecraft/class_3300;)V ARG 1 resourceManager - METHOD method_44226 streamStructures ()Ljava/util/stream/Stream; + METHOD method_44226 streamTemplates ()Ljava/util/stream/Stream; METHOD method_44227 (ILjava/lang/String;)Ljava/lang/String; ARG 1 filename - METHOD method_44228 getStructurePath (Lnet/minecraft/class_2960;Ljava/lang/String;)Ljava/nio/file/Path; + METHOD method_44228 getTemplatePath (Lnet/minecraft/class_2960;Ljava/lang/String;)Ljava/nio/file/Path; ARG 1 id ARG 2 extension METHOD method_44229 (Lnet/minecraft/class_2960;Ljava/lang/Throwable;)V ARG 1 throwable - METHOD method_44230 loadStructureFromSnbt (Lnet/minecraft/class_2960;Ljava/nio/file/Path;)Ljava/util/Optional; + METHOD method_44230 loadTemplateFromSnbt (Lnet/minecraft/class_2960;Ljava/nio/file/Path;)Ljava/util/Optional; ARG 1 id ARG 2 path - METHOD method_44231 loadStructure (Lnet/minecraft/class_3485$class_7513;Ljava/util/function/Consumer;)Ljava/util/Optional; + METHOD method_44231 loadTemplate (Lnet/minecraft/class_3485$class_7513;Ljava/util/function/Consumer;)Ljava/util/Optional; ARG 1 opener ARG 2 exceptionConsumer METHOD method_44232 (Lnet/minecraft/class_3485$class_7514;)Ljava/util/stream/Stream; @@ -60,9 +60,9 @@ CLASS net/minecraft/class_3485 net/minecraft/structure/StructureManager METHOD method_44234 (Ljava/lang/String;Ljava/util/function/Function;Ljava/nio/file/Path;Ljava/nio/file/Path;Ljava/util/function/Consumer;)V ARG 4 path ARG 5 consumer - METHOD method_44235 streamStructures (Ljava/nio/file/Path;)Ljava/util/stream/Stream; + METHOD method_44235 streamTemplates (Ljava/nio/file/Path;)Ljava/util/stream/Stream; ARG 1 namespaceDirectory - METHOD method_44236 streamStructures (Ljava/nio/file/Path;Ljava/lang/String;Ljava/lang/String;)Ljava/util/stream/Stream; + METHOD method_44236 streamTemplates (Ljava/nio/file/Path;Ljava/lang/String;Ljava/lang/String;)Ljava/util/stream/Stream; ARG 1 structuresDirectoryPath ARG 2 namespace ARG 3 extension @@ -71,20 +71,20 @@ CLASS net/minecraft/class_3485 net/minecraft/structure/StructureManager METHOD method_44238 toRelativePath (Ljava/nio/file/Path;Ljava/nio/file/Path;)Ljava/lang/String; ARG 1 root ARG 2 path - METHOD method_44239 streamStructuresFromResource ()Ljava/util/stream/Stream; + METHOD method_44239 streamTemplatesFromResource ()Ljava/util/stream/Stream; METHOD method_44240 (Ljava/nio/file/Path;)Ljava/util/stream/Stream; ARG 1 path - METHOD method_44241 streamStructuresFromGameTestFile ()Ljava/util/stream/Stream; + METHOD method_44241 streamTemplatesFromGameTestFile ()Ljava/util/stream/Stream; METHOD method_44242 (Ljava/nio/file/Path;)Z ARG 0 path - METHOD method_44243 streamStructuresFromFile ()Ljava/util/stream/Stream; - METHOD method_44245 loadStructure (Lnet/minecraft/class_2960;)Ljava/util/Optional; + METHOD method_44243 streamTemplatesFromFile ()Ljava/util/stream/Stream; + METHOD method_44245 loadTemplate (Lnet/minecraft/class_2960;)Ljava/util/Optional; ARG 1 id - METHOD method_44246 loadStructureFromGameTestFile (Lnet/minecraft/class_2960;)Ljava/util/Optional; + METHOD method_44246 loadTemplateFromGameTestFile (Lnet/minecraft/class_2960;)Ljava/util/Optional; ARG 1 id METHOD method_44247 (Lnet/minecraft/class_2960;)Lnet/minecraft/class_2960; ARG 0 id METHOD method_44248 (Lnet/minecraft/class_2960;)Z ARG 0 id - CLASS class_7513 StructureFileOpener - CLASS class_7514 Provider + CLASS class_7513 TemplateFileOpener + CLASS class_7514 Provider \ No newline at end of file diff --git a/mappings/net/minecraft/structure/StructureType.mapping b/mappings/net/minecraft/structure/StructureType.mapping deleted file mode 100644 index e6c69dcbfe..0000000000 --- a/mappings/net/minecraft/structure/StructureType.mapping +++ /dev/null @@ -1,4 +0,0 @@ -CLASS net/minecraft/class_7151 net/minecraft/structure/StructureType - METHOD method_41623 register (Ljava/lang/String;Lcom/mojang/serialization/Codec;)Lnet/minecraft/class_7151; - ARG 0 id - ARG 1 codec diff --git a/mappings/net/minecraft/structure/pool/SinglePoolElement.mapping b/mappings/net/minecraft/structure/pool/SinglePoolElement.mapping index 45bba28433..c9892310a5 100644 --- a/mappings/net/minecraft/structure/pool/SinglePoolElement.mapping +++ b/mappings/net/minecraft/structure/pool/SinglePoolElement.mapping @@ -8,9 +8,9 @@ CLASS net/minecraft/class_3781 net/minecraft/structure/pool/SinglePoolElement ARG 2 processors ARG 3 projection METHOD (Lnet/minecraft/class_3499;)V - ARG 1 structure + ARG 1 template METHOD method_16614 getDataStructureBlocks (Lnet/minecraft/class_3485;Lnet/minecraft/class_2338;Lnet/minecraft/class_2470;Z)Ljava/util/List; - ARG 1 structureManager + ARG 1 structureTemplateManager ARG 2 pos ARG 3 rotation ARG 4 mirroredAndRotated @@ -19,7 +19,7 @@ CLASS net/minecraft/class_3781 net/minecraft/structure/pool/SinglePoolElement ARG 2 box ARG 3 keepJigsaws METHOD method_27233 getStructure (Lnet/minecraft/class_3485;)Lnet/minecraft/class_3499; - ARG 1 structureManager + ARG 1 structureTemplateManager METHOD method_28877 encodeLocation (Lcom/mojang/datafixers/util/Either;Lcom/mojang/serialization/DynamicOps;Ljava/lang/Object;)Lcom/mojang/serialization/DataResult; ARG 0 location ARG 1 ops diff --git a/mappings/net/minecraft/structure/pool/StructurePool.mapping b/mappings/net/minecraft/structure/pool/StructurePool.mapping index f5c871530d..cc7ff74b6e 100644 --- a/mappings/net/minecraft/structure/pool/StructurePool.mapping +++ b/mappings/net/minecraft/structure/pool/StructurePool.mapping @@ -25,7 +25,7 @@ CLASS net/minecraft/class_3785 net/minecraft/structure/pool/StructurePool ARG 1 random METHOD method_16634 getTerminatorsId ()Lnet/minecraft/class_2960; METHOD method_19309 getHighestY (Lnet/minecraft/class_3485;)I - ARG 1 structureManager + ARG 1 structureTemplateManager METHOD method_19310 (Lnet/minecraft/class_3485;Lnet/minecraft/class_3784;)I ARG 1 element METHOD method_28886 (Lcom/mojang/serialization/codecs/RecordCodecBuilder$Instance;)Lcom/mojang/datafixers/kinds/App; diff --git a/mappings/net/minecraft/structure/pool/StructurePoolBasedGenerator.mapping b/mappings/net/minecraft/structure/pool/StructurePoolBasedGenerator.mapping index 98f52eae33..8fb549f17f 100644 --- a/mappings/net/minecraft/structure/pool/StructurePoolBasedGenerator.mapping +++ b/mappings/net/minecraft/structure/pool/StructurePoolBasedGenerator.mapping @@ -5,7 +5,7 @@ CLASS net/minecraft/class_3778 net/minecraft/structure/pool/StructurePoolBasedGe ARG 1 maxSize ARG 2 modifyBoundingBox ARG 3 chunkGenerator - ARG 4 structureManager + ARG 4 structureTemplateManager ARG 5 heightLimitView ARG 6 random ARG 7 structurePoolRegistry @@ -47,7 +47,7 @@ CLASS net/minecraft/class_3778 net/minecraft/structure/pool/StructurePoolBasedGe CLASS class_4182 StructurePoolGenerator FIELD field_18700 maxSize I FIELD field_18702 chunkGenerator Lnet/minecraft/class_2794; - FIELD field_18703 structureManager Lnet/minecraft/class_3485; + FIELD field_18703 structureTemplateManager Lnet/minecraft/class_3485; FIELD field_18704 children Ljava/util/List; FIELD field_18705 random Lnet/minecraft/class_5819; FIELD field_18706 structurePieces Ljava/util/Deque; @@ -56,7 +56,7 @@ CLASS net/minecraft/class_3778 net/minecraft/structure/pool/StructurePoolBasedGe ARG 1 registry ARG 2 maxSize ARG 3 chunkGenerator - ARG 4 structureManager + ARG 4 structureTemplateManager ARG 5 children ARG 6 random METHOD method_19306 generatePiece (Lnet/minecraft/class_3790;Lorg/apache/commons/lang3/mutable/MutableObject;IZLnet/minecraft/class_5539;Lnet/minecraft/class_7138;)V diff --git a/mappings/net/minecraft/structure/pool/StructurePoolElement.mapping b/mappings/net/minecraft/structure/pool/StructurePoolElement.mapping index e1782067bf..3b2b016a92 100644 --- a/mappings/net/minecraft/structure/pool/StructurePoolElement.mapping +++ b/mappings/net/minecraft/structure/pool/StructurePoolElement.mapping @@ -4,13 +4,13 @@ CLASS net/minecraft/class_3784 net/minecraft/structure/pool/StructurePoolElement METHOD (Lnet/minecraft/class_3785$class_3786;)V ARG 1 projection METHOD method_16601 getStart (Lnet/minecraft/class_3485;Lnet/minecraft/class_2470;)Lnet/minecraft/class_2382; - ARG 1 structureManager + ARG 1 structureTemplateManager ARG 2 rotation METHOD method_16622 setProjection (Lnet/minecraft/class_3785$class_3786;)Lnet/minecraft/class_3784; ARG 1 projection METHOD method_16624 getProjection ()Lnet/minecraft/class_3785$class_3786; METHOD method_16626 generate (Lnet/minecraft/class_3485;Lnet/minecraft/class_5281;Lnet/minecraft/class_5138;Lnet/minecraft/class_2794;Lnet/minecraft/class_2338;Lnet/minecraft/class_2338;Lnet/minecraft/class_2470;Lnet/minecraft/class_3341;Lnet/minecraft/class_5819;Z)Z - ARG 1 structureManager + ARG 1 structureTemplateManager ARG 2 world ARG 3 structureAccessor ARG 4 chunkGenerator @@ -21,12 +21,12 @@ CLASS net/minecraft/class_3784 net/minecraft/structure/pool/StructurePoolElement ARG 9 random ARG 10 keepJigsaws METHOD method_16627 getStructureBlockInfos (Lnet/minecraft/class_3485;Lnet/minecraft/class_2338;Lnet/minecraft/class_2470;Lnet/minecraft/class_5819;)Ljava/util/List; - ARG 1 structureManager + ARG 1 structureTemplateManager ARG 2 pos ARG 3 rotation ARG 4 random METHOD method_16628 getBoundingBox (Lnet/minecraft/class_3485;Lnet/minecraft/class_2338;Lnet/minecraft/class_2470;)Lnet/minecraft/class_3341; - ARG 1 structureManager + ARG 1 structureTemplateManager ARG 2 pos ARG 3 rotation METHOD method_16756 (Lnet/minecraft/class_1936;Lnet/minecraft/class_3499$class_3501;Lnet/minecraft/class_2338;Lnet/minecraft/class_2470;Lnet/minecraft/class_5819;Lnet/minecraft/class_3341;)V diff --git a/mappings/net/minecraft/tag/ConfiguredStructureFeatureTags.mapping b/mappings/net/minecraft/tag/StructureTags.mapping similarity index 50% rename from mappings/net/minecraft/tag/ConfiguredStructureFeatureTags.mapping rename to mappings/net/minecraft/tag/StructureTags.mapping index 8f0f785611..5ef2206853 100644 --- a/mappings/net/minecraft/tag/ConfiguredStructureFeatureTags.mapping +++ b/mappings/net/minecraft/tag/StructureTags.mapping @@ -1,3 +1,3 @@ -CLASS net/minecraft/class_7045 net/minecraft/tag/ConfiguredStructureFeatureTags +CLASS net/minecraft/class_7045 net/minecraft/tag/StructureTags METHOD method_41006 of (Ljava/lang/String;)Lnet/minecraft/class_6862; ARG 0 id diff --git a/mappings/net/minecraft/test/GameTest.mapping b/mappings/net/minecraft/test/GameTest.mapping index 2dc010ac23..78fa9a7ed8 100644 --- a/mappings/net/minecraft/test/GameTest.mapping +++ b/mappings/net/minecraft/test/GameTest.mapping @@ -6,7 +6,7 @@ CLASS net/minecraft/class_6302 net/minecraft/test/GameTest METHOD method_35933 batchId ()Ljava/lang/String; METHOD method_35934 rotation ()I METHOD method_35935 required ()Z - METHOD method_35936 structureName ()Ljava/lang/String; + METHOD method_35936 templateName ()Ljava/lang/String; METHOD method_35937 duration ()J METHOD method_35938 maxAttempts ()I METHOD method_35939 requiredSuccesses ()I diff --git a/mappings/net/minecraft/test/GameTestState.mapping b/mappings/net/minecraft/test/GameTestState.mapping index f5368ccb50..8e0865d6db 100644 --- a/mappings/net/minecraft/test/GameTestState.mapping +++ b/mappings/net/minecraft/test/GameTestState.mapping @@ -25,7 +25,7 @@ CLASS net/minecraft/class_4517 net/minecraft/test/GameTestState ARG 1 listener METHOD method_22168 fail (Ljava/lang/Throwable;)V ARG 1 throwable - METHOD method_22169 getStructurePath ()Ljava/lang/String; + METHOD method_22169 getTemplatePath ()Ljava/lang/String; METHOD method_22171 (Lnet/minecraft/class_4518;)V ARG 1 listener METHOD method_22172 getPos ()Lnet/minecraft/class_2338; @@ -46,7 +46,7 @@ CLASS net/minecraft/class_4517 net/minecraft/test/GameTestState ARG 1 runner METHOD method_23637 (Lnet/minecraft/class_4693;)V ARG 1 runner - METHOD method_23638 getStructureName ()Ljava/lang/String; + METHOD method_23638 getTemplateName ()Ljava/lang/String; METHOD method_23639 start ()V METHOD method_23640 complete ()V METHOD method_29402 getRotation ()Lnet/minecraft/class_2470; diff --git a/mappings/net/minecraft/test/StructureTestUtil.mapping b/mappings/net/minecraft/test/StructureTestUtil.mapping index 9aeb8e097a..fe8b8d2b66 100644 --- a/mappings/net/minecraft/test/StructureTestUtil.mapping +++ b/mappings/net/minecraft/test/StructureTestUtil.mapping @@ -27,18 +27,18 @@ CLASS net/minecraft/class_4525 net/minecraft/test/StructureTestUtil ARG 3 world METHOD method_22249 (Lnet/minecraft/class_2338;Lnet/minecraft/class_3218;Lnet/minecraft/class_2338;)Z ARG 2 structureBlockPos - METHOD method_22250 createStructure (Ljava/lang/String;Lnet/minecraft/class_2338;Lnet/minecraft/class_2470;ILnet/minecraft/class_3218;Z)Lnet/minecraft/class_2633; - ARG 0 structureName + METHOD method_22250 createStructureTemplate (Ljava/lang/String;Lnet/minecraft/class_2338;Lnet/minecraft/class_2470;ILnet/minecraft/class_3218;Z)Lnet/minecraft/class_2633; + ARG 0 templateName ARG 1 pos ARG 2 rotation ARG 4 world METHOD method_22251 createTestArea (Ljava/lang/String;Lnet/minecraft/class_2338;Lnet/minecraft/class_2382;Lnet/minecraft/class_2470;Lnet/minecraft/class_3218;)V - ARG 0 structure + ARG 0 testName ARG 1 pos ARG 2 relativePos ARG 3 rotation ARG 4 world - METHOD method_22252 placeStructure (Ljava/lang/String;Lnet/minecraft/class_2338;Lnet/minecraft/class_2470;Lnet/minecraft/class_3218;Z)Lnet/minecraft/class_2633; + METHOD method_22252 placeStructureTemplate (Ljava/lang/String;Lnet/minecraft/class_2338;Lnet/minecraft/class_2470;Lnet/minecraft/class_3218;Z)Lnet/minecraft/class_2633; ARG 0 name ARG 1 pos ARG 2 rotation @@ -62,8 +62,8 @@ CLASS net/minecraft/class_4525 net/minecraft/test/StructureTestUtil ARG 0 altitude ARG 1 pos ARG 2 world - METHOD method_22369 createStructure (Ljava/lang/String;Lnet/minecraft/class_3218;)Lnet/minecraft/class_3499; - ARG 0 structureId + METHOD method_22369 createStructureTemplate (Ljava/lang/String;Lnet/minecraft/class_3218;)Lnet/minecraft/class_3499; + ARG 0 templateId ARG 1 world METHOD method_29408 getRotation (I)Lnet/minecraft/class_2470; ARG 0 steps diff --git a/mappings/net/minecraft/test/TestFunction.mapping b/mappings/net/minecraft/test/TestFunction.mapping index f4607de1a8..c6e37b12c0 100644 --- a/mappings/net/minecraft/test/TestFunction.mapping +++ b/mappings/net/minecraft/test/TestFunction.mapping @@ -1,7 +1,7 @@ CLASS net/minecraft/class_4529 net/minecraft/test/TestFunction FIELD field_20583 batchId Ljava/lang/String; - FIELD field_20584 structurePath Ljava/lang/String; - FIELD field_20585 structureName Ljava/lang/String; + FIELD field_20584 templatePath Ljava/lang/String; + FIELD field_20585 templateName Ljava/lang/String; FIELD field_20586 required Z FIELD field_20587 starter Ljava/util/function/Consumer; FIELD field_20588 tickLimit I @@ -11,16 +11,16 @@ CLASS net/minecraft/class_4529 net/minecraft/test/TestFunction FIELD field_27815 requiredSuccesses I METHOD (Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;IJZLjava/util/function/Consumer;)V ARG 1 batchId - ARG 2 structurePath - ARG 3 structureName + ARG 2 templatePath + ARG 3 templateName ARG 4 tickLimit ARG 5 duration ARG 7 required ARG 8 starter METHOD (Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Lnet/minecraft/class_2470;IJZIILjava/util/function/Consumer;)V ARG 1 batchId - ARG 2 structurePath - ARG 3 structureName + ARG 2 templatePath + ARG 3 templateName ARG 4 rotation ARG 5 tickLimit ARG 6 duration @@ -30,17 +30,17 @@ CLASS net/minecraft/class_4529 net/minecraft/test/TestFunction ARG 11 starter METHOD (Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Lnet/minecraft/class_2470;IJZLjava/util/function/Consumer;)V ARG 1 batchId - ARG 2 structurePath - ARG 3 structureName + ARG 2 templatePath + ARG 3 templateName ARG 4 rotation ARG 5 tickLimit ARG 6 duration ARG 8 required ARG 9 starter - METHOD method_22296 getStructurePath ()Ljava/lang/String; + METHOD method_22296 getTemplatePath ()Ljava/lang/String; METHOD method_22297 start (Lnet/minecraft/class_4516;)V ARG 1 context - METHOD method_22298 getStructureName ()Ljava/lang/String; + METHOD method_22298 getTemplateName ()Ljava/lang/String; METHOD method_22299 getTickLimit ()I METHOD method_22300 isRequired ()Z METHOD method_22301 getBatchId ()Ljava/lang/String; diff --git a/mappings/net/minecraft/world/StructureHolder.mapping b/mappings/net/minecraft/world/StructureHolder.mapping index 537a857680..134057352b 100644 --- a/mappings/net/minecraft/world/StructureHolder.mapping +++ b/mappings/net/minecraft/world/StructureHolder.mapping @@ -1,14 +1,14 @@ CLASS net/minecraft/class_2810 net/minecraft/world/StructureHolder METHOD method_12179 getStructureReferences ()Ljava/util/Map; METHOD method_12180 getStructureReferences (Lnet/minecraft/class_3195;)Lit/unimi/dsi/fastutil/longs/LongSet; - ARG 1 structureType + ARG 1 structure METHOD method_12181 getStructureStart (Lnet/minecraft/class_3195;)Lnet/minecraft/class_3449; - ARG 1 structureType + ARG 1 structure METHOD method_12182 addStructureReference (Lnet/minecraft/class_3195;J)V - ARG 1 structureType + ARG 1 structure ARG 2 reference METHOD method_12183 setStructureReferences (Ljava/util/Map;)V ARG 1 structureReferences METHOD method_12184 setStructureStart (Lnet/minecraft/class_3195;Lnet/minecraft/class_3449;)V - ARG 1 structureType + ARG 1 structure ARG 2 start diff --git a/mappings/net/minecraft/world/StructureLocator.mapping b/mappings/net/minecraft/world/StructureLocator.mapping index 61ff0e3d0b..c94965dbeb 100644 --- a/mappings/net/minecraft/world/StructureLocator.mapping +++ b/mappings/net/minecraft/world/StructureLocator.mapping @@ -4,21 +4,21 @@ CLASS net/minecraft/class_6832 net/minecraft/world/StructureLocator FIELD field_36227 chunkIoWorker Lnet/minecraft/class_6830; FIELD field_36228 registryManager Lnet/minecraft/class_5455; FIELD field_36229 biomeRegistry Lnet/minecraft/class_2378; - FIELD field_36230 structureManager Lnet/minecraft/class_3485; + FIELD field_36230 structureTemplateManager Lnet/minecraft/class_3485; FIELD field_36231 worldKey Lnet/minecraft/class_5321; FIELD field_36232 chunkGenerator Lnet/minecraft/class_2794; FIELD field_36233 world Lnet/minecraft/class_5539; FIELD field_36234 biomeSource Lnet/minecraft/class_1966; FIELD field_36235 seed J FIELD field_36236 dataFixer Lcom/mojang/datafixers/DataFixer; - FIELD field_36237 cachedFeaturesByChunkPos Lit/unimi/dsi/fastutil/longs/Long2ObjectMap; - FIELD field_36238 generationPossibilityByFeature Ljava/util/Map; - FIELD field_36418 structureTypeRegistry Lnet/minecraft/class_2378; + FIELD field_36237 cachedStructuresByChunkPos Lit/unimi/dsi/fastutil/longs/Long2ObjectMap; + FIELD field_36238 generationPossibilityByStructure Ljava/util/Map; + FIELD field_36418 structureRegistry Lnet/minecraft/class_2378; FIELD field_37750 noiseConfig Lnet/minecraft/class_7138; METHOD (Lnet/minecraft/class_6830;Lnet/minecraft/class_5455;Lnet/minecraft/class_3485;Lnet/minecraft/class_5321;Lnet/minecraft/class_2794;Lnet/minecraft/class_7138;Lnet/minecraft/class_5539;Lnet/minecraft/class_1966;JLcom/mojang/datafixers/DataFixer;)V ARG 1 chunkIoWorker ARG 2 registryManager - ARG 3 structureManager + ARG 3 structureTemplateManager ARG 4 worldKey ARG 5 chunkGenerator ARG 6 noiseConfig @@ -32,28 +32,28 @@ CLASS net/minecraft/class_6832 net/minecraft/world/StructureLocator ARG 1 pos ARG 3 referencesByStructure METHOD method_39829 isGenerationPossible (Lnet/minecraft/class_1923;Lnet/minecraft/class_3195;)Z - COMMENT {@return whether {@code feature} is able to generate in {@code pos}} + COMMENT {@return whether {@code structure} is able to generate in {@code pos}} COMMENT COMMENT

This method only performs simple checks like biomes. ARG 1 pos - ARG 2 feature + ARG 2 structure METHOD method_39830 incrementReferences (Lnet/minecraft/class_1923;Lnet/minecraft/class_3195;)V ARG 1 pos - ARG 2 feature + ARG 2 structure METHOD method_39831 getStructurePresence (Lnet/minecraft/class_1923;Lnet/minecraft/class_3195;Z)Lnet/minecraft/class_6833; ARG 1 pos ARG 2 type ARG 3 skipReferencedStructures METHOD method_39832 getStructurePresence (Lnet/minecraft/class_1923;Lnet/minecraft/class_3195;ZJ)Lnet/minecraft/class_6833; ARG 1 pos - ARG 2 feature + ARG 2 structure ARG 3 skipReferencedStructures ARG 4 posLong METHOD method_39833 cache (Lnet/minecraft/class_1923;Ljava/util/Map;)V ARG 1 pos ARG 2 structureStarts METHOD method_39834 (Lnet/minecraft/class_3195;)Lit/unimi/dsi/fastutil/longs/Long2BooleanMap; - ARG 0 feature + ARG 0 structure2 METHOD method_39836 (Lnet/minecraft/class_3195;Ljava/lang/Integer;)Ljava/lang/Integer; ARG 0 feature ARG 1 references @@ -63,11 +63,11 @@ CLASS net/minecraft/class_6832 net/minecraft/world/StructureLocator METHOD method_39838 createMapIfEmpty (Lit/unimi/dsi/fastutil/objects/Object2IntMap;)Lit/unimi/dsi/fastutil/objects/Object2IntMap; ARG 0 map METHOD method_39839 (Lit/unimi/dsi/fastutil/objects/Object2IntMap;Lnet/minecraft/class_3195;Lnet/minecraft/class_3449;)V - ARG 0 feature + ARG 0 structure ARG 1 start METHOD method_39840 getStructurePresence (Lit/unimi/dsi/fastutil/objects/Object2IntMap;Lnet/minecraft/class_3195;Z)Lnet/minecraft/class_6833; ARG 1 referencesByStructure - ARG 2 feature + ARG 2 structure ARG 3 skipReferencedStructures METHOD method_39842 collectStructuresAndReferences (Lnet/minecraft/class_2487;)Lit/unimi/dsi/fastutil/objects/Object2IntMap; ARG 1 nbt diff --git a/mappings/net/minecraft/world/chunk/ChunkStatus.mapping b/mappings/net/minecraft/world/chunk/ChunkStatus.mapping index 92d19b8e2a..5f7e7a1071 100644 --- a/mappings/net/minecraft/world/chunk/ChunkStatus.mapping +++ b/mappings/net/minecraft/world/chunk/ChunkStatus.mapping @@ -26,7 +26,7 @@ CLASS net/minecraft/class_2806 net/minecraft/world/chunk/ChunkStatus ARG 1 executor ARG 2 world ARG 3 generator - ARG 4 structureManager + ARG 4 structureTemplateManager ARG 5 lightingProvider ARG 6 fullChunkConverter ARG 7 chunks @@ -69,7 +69,7 @@ CLASS net/minecraft/class_2806 net/minecraft/world/chunk/ChunkStatus METHOD method_16566 (Lnet/minecraft/class_2806;Lnet/minecraft/class_3218;Lnet/minecraft/class_3485;Lnet/minecraft/class_3227;Ljava/util/function/Function;Lnet/minecraft/class_2791;)Ljava/util/concurrent/CompletableFuture; ARG 0 targetStatus ARG 1 world - ARG 2 structureManager + ARG 2 structureTemplateManager ARG 3 lightingProvider ARG 4 fullChunkConverter ARG 5 chunk @@ -99,7 +99,7 @@ CLASS net/minecraft/class_2806 net/minecraft/world/chunk/ChunkStatus ARG 1 executor ARG 2 world ARG 3 generator - ARG 4 structureManager + ARG 4 structureTemplateManager ARG 5 lightingProvider ARG 6 fullChunkConverter ARG 7 chunks @@ -119,7 +119,7 @@ CLASS net/minecraft/class_2806 net/minecraft/world/chunk/ChunkStatus ARG 6 loadTask METHOD method_20612 runLoadTask (Lnet/minecraft/class_3218;Lnet/minecraft/class_3485;Lnet/minecraft/class_3227;Ljava/util/function/Function;Lnet/minecraft/class_2791;)Ljava/util/concurrent/CompletableFuture; ARG 1 world - ARG 2 structureManager + ARG 2 structureTemplateManager ARG 3 lightingProvider ARG 4 fullChunkConverter ARG 5 chunk @@ -128,7 +128,7 @@ CLASS net/minecraft/class_2806 net/minecraft/world/chunk/ChunkStatus ARG 1 executor ARG 2 world ARG 3 generator - ARG 4 structureManager + ARG 4 structureTemplateManager ARG 5 lightingProvider ARG 6 fullChunkConverter ARG 7 chunks @@ -139,7 +139,7 @@ CLASS net/minecraft/class_2806 net/minecraft/world/chunk/ChunkStatus ARG 1 executor ARG 2 world ARG 3 generator - ARG 4 structureManager + ARG 4 structureTemplateManager ARG 5 lightingProvider ARG 6 fullChunkConverter ARG 7 chunks @@ -148,7 +148,7 @@ CLASS net/minecraft/class_2806 net/minecraft/world/chunk/ChunkStatus METHOD method_20615 (Lnet/minecraft/class_2806;Lnet/minecraft/class_3218;Lnet/minecraft/class_3485;Lnet/minecraft/class_3227;Ljava/util/function/Function;Lnet/minecraft/class_2791;)Ljava/util/concurrent/CompletableFuture; ARG 0 targetStatus ARG 1 world - ARG 2 structureManager + ARG 2 structureTemplateManager ARG 3 lightingProvider ARG 4 fullChunkConverter ARG 5 chunk @@ -161,7 +161,7 @@ CLASS net/minecraft/class_2806 net/minecraft/world/chunk/ChunkStatus METHOD method_38278 (Lnet/minecraft/class_2806;Lnet/minecraft/class_3218;Lnet/minecraft/class_3485;Lnet/minecraft/class_3227;Ljava/util/function/Function;Lnet/minecraft/class_2791;)Ljava/util/concurrent/CompletableFuture; ARG 0 targetStatus ARG 1 world - ARG 2 structureManager + ARG 2 structureTemplateManager ARG 3 lightingProvider ARG 4 fullChunkConverter ARG 5 chunk @@ -180,7 +180,7 @@ CLASS net/minecraft/class_2806 net/minecraft/world/chunk/ChunkStatus ARG 1 executor ARG 2 world ARG 3 generator - ARG 4 structureManager + ARG 4 structureTemplateManager ARG 5 lightingProvider ARG 6 fullChunkConverter ARG 7 chunks @@ -191,7 +191,7 @@ CLASS net/minecraft/class_2806 net/minecraft/world/chunk/ChunkStatus ARG 1 executor ARG 2 world ARG 3 generator - ARG 4 structureManager + ARG 4 structureTemplateManager ARG 5 lightingProvider ARG 6 fullChunkConverter ARG 7 chunks @@ -204,7 +204,7 @@ CLASS net/minecraft/class_2806 net/minecraft/world/chunk/ChunkStatus ARG 1 executor ARG 2 world ARG 3 generator - ARG 4 structureManager + ARG 4 structureTemplateManager ARG 5 lightingProvider ARG 6 fullChunkConverter ARG 7 chunks @@ -219,14 +219,14 @@ CLASS net/minecraft/class_2806 net/minecraft/world/chunk/ChunkStatus METHOD method_39790 (Lnet/minecraft/class_2806;Lnet/minecraft/class_3218;Lnet/minecraft/class_3485;Lnet/minecraft/class_3227;Ljava/util/function/Function;Lnet/minecraft/class_2791;)Ljava/util/concurrent/CompletableFuture; ARG 0 targetStatus ARG 1 world - ARG 2 structureManager + ARG 2 structureTemplateManager ARG 3 lightingProvider ARG 4 fullChunkConverter ARG 5 chunk METHOD method_41523 (Lnet/minecraft/class_2806;Lnet/minecraft/class_3218;Lnet/minecraft/class_3485;Lnet/minecraft/class_3227;Ljava/util/function/Function;Lnet/minecraft/class_2791;)Ljava/util/concurrent/CompletableFuture; ARG 0 status ARG 1 world - ARG 2 structureManager + ARG 2 structureTemplateManager ARG 3 lightingProvider ARG 4 fullChunkConverter ARG 5 chunk @@ -238,7 +238,7 @@ CLASS net/minecraft/class_2806 net/minecraft/world/chunk/ChunkStatus ARG 2 executor ARG 3 world ARG 4 generator - ARG 5 structureManager + ARG 5 structureTemplateManager ARG 6 lightingProvider ARG 7 fullChunkConverter COMMENT a function that can convert a raw chunk to a full chunk @@ -263,7 +263,7 @@ CLASS net/minecraft/class_2806 net/minecraft/world/chunk/ChunkStatus METHOD doWork (Lnet/minecraft/class_2806;Lnet/minecraft/class_3218;Lnet/minecraft/class_3485;Lnet/minecraft/class_3227;Ljava/util/function/Function;Lnet/minecraft/class_2791;)Ljava/util/concurrent/CompletableFuture; ARG 1 targetStatus ARG 2 world - ARG 3 structureManager + ARG 3 structureTemplateManager ARG 4 lightingProvider ARG 5 fullChunkConverter COMMENT a function that can convert a raw chunk to a full chunk diff --git a/mappings/net/minecraft/world/gen/StructureAccessor.mapping b/mappings/net/minecraft/world/gen/StructureAccessor.mapping index 95aa17a7d2..ed273f5ce9 100644 --- a/mappings/net/minecraft/world/gen/StructureAccessor.mapping +++ b/mappings/net/minecraft/world/gen/StructureAccessor.mapping @@ -8,22 +8,22 @@ CLASS net/minecraft/class_5138 net/minecraft/world/gen/StructureAccessor ARG 3 locator METHOD method_26973 addStructureReference (Lnet/minecraft/class_4076;Lnet/minecraft/class_3195;JLnet/minecraft/class_2810;)V ARG 1 pos - ARG 2 structureFeature + ARG 2 structure ARG 3 reference ARG 5 holder METHOD method_26975 getStructureStart (Lnet/minecraft/class_4076;Lnet/minecraft/class_3195;Lnet/minecraft/class_2810;)Lnet/minecraft/class_3449; ARG 1 pos - ARG 2 structureFeature + ARG 2 structure ARG 3 holder METHOD method_26976 setStructureStart (Lnet/minecraft/class_4076;Lnet/minecraft/class_3195;Lnet/minecraft/class_3449;Lnet/minecraft/class_2810;)V ARG 1 pos - ARG 2 structureFeature + ARG 2 structure ARG 3 structureStart ARG 4 holder METHOD method_27834 shouldGenerateStructures ()Z METHOD method_28388 getStructureAt (Lnet/minecraft/class_2338;Lnet/minecraft/class_3195;)Lnet/minecraft/class_3449; ARG 1 pos - ARG 2 structureFeature + ARG 2 structure METHOD method_29951 forRegion (Lnet/minecraft/class_3233;)Lnet/minecraft/class_5138; ARG 1 region METHOD method_38852 hasStructureReferences (Lnet/minecraft/class_2338;)Z @@ -32,17 +32,17 @@ CLASS net/minecraft/class_5138 net/minecraft/world/gen/StructureAccessor COMMENT {@return a list of structure starts for this chunk} The structure starts COMMENT are computed from the structure references of the given section's chunk. ARG 1 sectionPos - ARG 2 structureType + ARG 2 structure METHOD method_38854 getStructureContaining (Lnet/minecraft/class_2338;Lnet/minecraft/class_3195;)Lnet/minecraft/class_3449; COMMENT {@return a structure that contains the given {@code pos}} Compared to COMMENT {@link #getStructureAt}, this does not return a structure if the given COMMENT position is in the expanded bounding box of the structure but not in any COMMENT child piece of it. ARG 1 pos - ARG 2 structureFeature + ARG 2 structure METHOD method_39783 getStructurePresence (Lnet/minecraft/class_1923;Lnet/minecraft/class_3195;Z)Lnet/minecraft/class_6833; ARG 1 chunkPos - ARG 2 structureType + ARG 2 structure ARG 3 skipExistingChunk METHOD method_39784 incrementReferences (Lnet/minecraft/class_3449;)V ARG 1 structureStart @@ -51,10 +51,10 @@ CLASS net/minecraft/class_5138 net/minecraft/world/gen/StructureAccessor ARG 2 structureStart METHOD method_41034 getStructureContaining (Lnet/minecraft/class_2338;Lnet/minecraft/class_5321;)Lnet/minecraft/class_3449; ARG 1 pos - ARG 2 structureFeature + ARG 2 structure METHOD method_41036 getRegistryManager ()Lnet/minecraft/class_5455; METHOD method_41037 getStructureReferences (Lnet/minecraft/class_2338;)Ljava/util/Map; ARG 1 pos METHOD method_41413 getStructureContaining (Lnet/minecraft/class_2338;Lnet/minecraft/class_6862;)Lnet/minecraft/class_3449; ARG 1 pos - ARG 2 structureFeatureTag + ARG 2 structureTag diff --git a/mappings/net/minecraft/world/gen/chunk/ChunkGenerator.mapping b/mappings/net/minecraft/world/gen/chunk/ChunkGenerator.mapping index 2af9eea056..19badf23cc 100644 --- a/mappings/net/minecraft/world/gen/chunk/ChunkGenerator.mapping +++ b/mappings/net/minecraft/world/gen/chunk/ChunkGenerator.mapping @@ -80,7 +80,7 @@ CLASS net/minecraft/class_2794 net/minecraft/world/gen/chunk/ChunkGenerator ARG 2 noiseConfig ARG 3 structureAccessor ARG 4 chunk - ARG 5 structureManager + ARG 5 structureTemplateManager ARG 6 seed METHOD method_16130 addStructureReferences (Lnet/minecraft/class_5281;Lnet/minecraft/class_5138;Lnet/minecraft/class_2791;)V COMMENT Finds all structures that the given chunk intersects, and adds references to their starting chunks to it. diff --git a/mappings/net/minecraft/world/gen/structure/Structure.mapping b/mappings/net/minecraft/world/gen/structure/Structure.mapping new file mode 100644 index 0000000000..b5d2955b69 --- /dev/null +++ b/mappings/net/minecraft/world/gen/structure/Structure.mapping @@ -0,0 +1,105 @@ +CLASS net/minecraft/class_3195 net/minecraft/world/gen/structure/Structure + FIELD field_37744 STRUCTURE_CODEC Lcom/mojang/serialization/Codec; + FIELD field_37745 ENTRY_CODEC Lcom/mojang/serialization/Codec; + FIELD field_38429 config Lnet/minecraft/class_3195$class_7302; + METHOD (Lnet/minecraft/class_3195$class_7302;)V + ARG 1 config + METHOD method_38676 getStructurePosition (Lnet/minecraft/class_3195$class_7149;)Ljava/util/Optional; + ARG 1 context + METHOD method_38694 postPlace (Lnet/minecraft/class_5281;Lnet/minecraft/class_5138;Lnet/minecraft/class_2794;Lnet/minecraft/class_5819;Lnet/minecraft/class_3341;Lnet/minecraft/class_1923;Lnet/minecraft/class_6624;)V + ARG 1 world + ARG 2 structureAccessor + ARG 3 chunkGenerator + ARG 4 random + ARG 5 box + ARG 6 chunkPos + ARG 7 pieces + METHOD method_41607 getValidBiomes ()Lnet/minecraft/class_6885; + METHOD method_41609 expandBoxIfShouldAdaptNoise (Lnet/minecraft/class_3341;)Lnet/minecraft/class_3341; + ARG 1 box + METHOD method_41610 getMinCornerHeight (Lnet/minecraft/class_3195$class_7149;II)I + ARG 0 context + ARG 1 width + ARG 2 height + METHOD method_41611 getCornerHeights (Lnet/minecraft/class_3195$class_7149;IIII)[I + ARG 0 context + ARG 1 x + ARG 2 width + ARG 3 z + ARG 4 height + METHOD method_41612 getStructurePosition (Lnet/minecraft/class_3195$class_7149;Lnet/minecraft/class_2902$class_2903;Ljava/util/function/Consumer;)Ljava/util/Optional; + ARG 0 context + ARG 1 heightmap + ARG 2 generator + METHOD method_41613 isBiomeValid (Lnet/minecraft/class_3195$class_7150;Lnet/minecraft/class_2794;Lnet/minecraft/class_7138;Ljava/util/function/Predicate;)Z + ARG 0 result + ARG 1 chunkGenerator + ARG 2 noiseConfig + ARG 3 validBiomes + METHOD method_41614 createStructureStart (Lnet/minecraft/class_5455;Lnet/minecraft/class_2794;Lnet/minecraft/class_1966;Lnet/minecraft/class_7138;Lnet/minecraft/class_3485;JLnet/minecraft/class_1923;ILnet/minecraft/class_5539;Ljava/util/function/Predicate;)Lnet/minecraft/class_3449; + ARG 1 dynamicRegistryManager + ARG 2 chunkGenerator + ARG 3 biomeSource + ARG 4 noiseConfig + ARG 5 structureTemplateManager + ARG 6 seed + ARG 8 chunkPos + ARG 9 references + ARG 10 world + ARG 11 validBiomes + METHOD method_41615 getStructureSpawns ()Ljava/util/Map; + METHOD method_41616 getFeatureGenerationStep ()Lnet/minecraft/class_2893$class_2895; + METHOD method_41618 getType ()Lnet/minecraft/class_7151; + METHOD method_42381 getMinCornerHeight (Lnet/minecraft/class_3195$class_7149;IIII)I + ARG 0 context + ARG 1 x + ARG 2 z + ARG 3 width + ARG 4 height + METHOD method_42382 getShiftedPos (Lnet/minecraft/class_3195$class_7149;Lnet/minecraft/class_2470;)Lnet/minecraft/class_2338; + ARG 1 context + ARG 2 rotation + METHOD method_42697 configCodecBuilder (Lcom/mojang/serialization/codecs/RecordCodecBuilder$Instance;)Lcom/mojang/serialization/codecs/RecordCodecBuilder; + ARG 0 instance + METHOD method_42698 (Lnet/minecraft/class_3195;)Lnet/minecraft/class_3195$class_7302; + ARG 0 feature + METHOD method_42699 createCodec (Ljava/util/function/Function;)Lcom/mojang/serialization/Codec; + ARG 0 featureCreator + METHOD method_42700 (Ljava/util/function/Function;Lcom/mojang/serialization/codecs/RecordCodecBuilder$Instance;)Lcom/mojang/datafixers/kinds/App; + ARG 1 instance + METHOD method_42701 getTerrainAdaptation ()Lnet/minecraft/class_5847; + CLASS class_7149 Context + FIELD comp_561 dynamicRegistryManager Lnet/minecraft/class_5455; + FIELD comp_564 noiseConfig Lnet/minecraft/class_7138; + FIELD comp_569 world Lnet/minecraft/class_5539; + FIELD comp_570 biomePredicate Ljava/util/function/Predicate; + METHOD (Lnet/minecraft/class_5455;Lnet/minecraft/class_2794;Lnet/minecraft/class_1966;Lnet/minecraft/class_7138;Lnet/minecraft/class_3485;JLnet/minecraft/class_1923;Lnet/minecraft/class_5539;Ljava/util/function/Predicate;)V + ARG 1 dynamicRegistryManager + ARG 2 chunkGenerator + ARG 3 biomeSource + ARG 4 noiseConfig + ARG 5 structureTemplateManager + ARG 6 seed + ARG 8 chunkPos + ARG 9 world + ARG 10 biomePredicate + METHOD comp_561 dynamicRegistryManager ()Lnet/minecraft/class_5455; + METHOD comp_564 noiseConfig ()Lnet/minecraft/class_7138; + METHOD comp_569 world ()Lnet/minecraft/class_5539; + METHOD comp_570 biomePredicate ()Ljava/util/function/Predicate; + METHOD method_41619 createChunkRandom (JLnet/minecraft/class_1923;)Lnet/minecraft/class_2919; + ARG 0 seed + ARG 2 chunkPos + CLASS class_7150 StructurePosition + METHOD (Lnet/minecraft/class_2338;Ljava/util/function/Consumer;)V + ARG 1 pos + ARG 2 generator + METHOD method_44019 generate ()Lnet/minecraft/class_6626; + METHOD method_44020 (Lnet/minecraft/class_6626;)Lnet/minecraft/class_6626; + ARG 0 collector + METHOD method_44021 (Ljava/util/function/Consumer;)Lnet/minecraft/class_6626; + ARG 0 generator + CLASS class_7302 Config + FIELD field_38430 CODEC Lcom/mojang/serialization/MapCodec; + METHOD method_42702 (Lcom/mojang/serialization/codecs/RecordCodecBuilder$Instance;)Lcom/mojang/datafixers/kinds/App; + ARG 0 instance diff --git a/mappings/net/minecraft/world/gen/structure/StructureTypeKeys.mapping b/mappings/net/minecraft/world/gen/structure/StructureKeys.mapping similarity index 88% rename from mappings/net/minecraft/world/gen/structure/StructureTypeKeys.mapping rename to mappings/net/minecraft/world/gen/structure/StructureKeys.mapping index 8d5b6c0afd..3280ffeb66 100644 --- a/mappings/net/minecraft/world/gen/structure/StructureTypeKeys.mapping +++ b/mappings/net/minecraft/world/gen/structure/StructureKeys.mapping @@ -1,3 +1,3 @@ -CLASS net/minecraft/class_7058 net/minecraft/world/gen/structure/StructureTypeKeys +CLASS net/minecraft/class_7058 net/minecraft/world/gen/structure/StructureKeys METHOD method_41142 of (Ljava/lang/String;)Lnet/minecraft/class_5321; ARG 0 id diff --git a/mappings/net/minecraft/world/gen/structure/StructureType.mapping b/mappings/net/minecraft/world/gen/structure/StructureType.mapping index e49178036c..db423330fd 100644 --- a/mappings/net/minecraft/world/gen/structure/StructureType.mapping +++ b/mappings/net/minecraft/world/gen/structure/StructureType.mapping @@ -1,107 +1,4 @@ -CLASS net/minecraft/class_3195 net/minecraft/world/gen/structure/StructureType - FIELD field_37744 STRUCTURE_TYPE_CODEC Lcom/mojang/serialization/Codec; - FIELD field_37745 ENTRY_CODEC Lcom/mojang/serialization/Codec; - FIELD field_38429 config Lnet/minecraft/class_3195$class_7302; - METHOD (Lnet/minecraft/class_3195$class_7302;)V - ARG 1 config - METHOD method_38676 getStructurePosition (Lnet/minecraft/class_3195$class_7149;)Ljava/util/Optional; - ARG 1 context - METHOD method_38694 postPlace (Lnet/minecraft/class_5281;Lnet/minecraft/class_5138;Lnet/minecraft/class_2794;Lnet/minecraft/class_5819;Lnet/minecraft/class_3341;Lnet/minecraft/class_1923;Lnet/minecraft/class_6624;)V - ARG 1 world - ARG 2 structureAccessor - ARG 3 chunkGenerator - ARG 4 random - ARG 5 box - ARG 6 chunkPos - ARG 7 pieces - METHOD method_41607 getValidBiomes ()Lnet/minecraft/class_6885; - METHOD method_41609 expandBoxIfShouldAdaptNoise (Lnet/minecraft/class_3341;)Lnet/minecraft/class_3341; - ARG 1 box - METHOD method_41610 getMinCornerHeight (Lnet/minecraft/class_3195$class_7149;II)I - ARG 0 context - ARG 1 width - ARG 2 height - METHOD method_41611 getCornerHeights (Lnet/minecraft/class_3195$class_7149;IIII)[I - ARG 0 context - ARG 1 x - ARG 2 width - ARG 3 z - ARG 4 height - METHOD method_41612 getStructurePosition (Lnet/minecraft/class_3195$class_7149;Lnet/minecraft/class_2902$class_2903;Ljava/util/function/Consumer;)Ljava/util/Optional; - ARG 0 context - ARG 1 heightmap - ARG 2 generator - METHOD method_41613 isBiomeValid (Lnet/minecraft/class_3195$class_7150;Lnet/minecraft/class_2794;Lnet/minecraft/class_7138;Ljava/util/function/Predicate;)Z - ARG 0 result - ARG 1 chunkGenerator - ARG 2 noiseConfig - ARG 3 validBiomes - METHOD method_41614 createStructureStart (Lnet/minecraft/class_5455;Lnet/minecraft/class_2794;Lnet/minecraft/class_1966;Lnet/minecraft/class_7138;Lnet/minecraft/class_3485;JLnet/minecraft/class_1923;ILnet/minecraft/class_5539;Ljava/util/function/Predicate;)Lnet/minecraft/class_3449; - ARG 1 dynamicRegistryManager - ARG 2 chunkGenerator - ARG 3 biomeSource - ARG 4 noiseConfig - ARG 5 structureManager - ARG 6 seed - ARG 8 chunkPos - ARG 9 references - ARG 10 world - ARG 11 validBiomes - METHOD method_41615 getStructureSpawns ()Ljava/util/Map; - METHOD method_41616 getFeatureGenerationStep ()Lnet/minecraft/class_2893$class_2895; - METHOD method_41618 getType ()Lnet/minecraft/class_7151; - METHOD method_42381 getMinCornerHeight (Lnet/minecraft/class_3195$class_7149;IIII)I - ARG 0 context - ARG 1 x - ARG 2 z - ARG 3 width - ARG 4 height - METHOD method_42382 getShiftedPos (Lnet/minecraft/class_3195$class_7149;Lnet/minecraft/class_2470;)Lnet/minecraft/class_2338; - ARG 1 context - ARG 2 rotation - METHOD method_42697 configCodecBuilder (Lcom/mojang/serialization/codecs/RecordCodecBuilder$Instance;)Lcom/mojang/serialization/codecs/RecordCodecBuilder; - ARG 0 instance - METHOD method_42698 (Lnet/minecraft/class_3195;)Lnet/minecraft/class_3195$class_7302; - ARG 0 feature - METHOD method_42699 createCodec (Ljava/util/function/Function;)Lcom/mojang/serialization/Codec; - ARG 0 featureCreator - METHOD method_42700 (Ljava/util/function/Function;Lcom/mojang/serialization/codecs/RecordCodecBuilder$Instance;)Lcom/mojang/datafixers/kinds/App; - ARG 1 instance - METHOD method_42701 getTerrainAdaptation ()Lnet/minecraft/class_5847; - CLASS class_7149 Context - FIELD comp_561 dynamicRegistryManager Lnet/minecraft/class_5455; - FIELD comp_564 noiseConfig Lnet/minecraft/class_7138; - FIELD comp_565 structureManager Lnet/minecraft/class_3485; - FIELD comp_569 world Lnet/minecraft/class_5539; - FIELD comp_570 biomePredicate Ljava/util/function/Predicate; - METHOD (Lnet/minecraft/class_5455;Lnet/minecraft/class_2794;Lnet/minecraft/class_1966;Lnet/minecraft/class_7138;Lnet/minecraft/class_3485;JLnet/minecraft/class_1923;Lnet/minecraft/class_5539;Ljava/util/function/Predicate;)V - ARG 1 dynamicRegistryManager - ARG 2 chunkGenerator - ARG 3 biomeSource - ARG 4 noiseConfig - ARG 5 structureManager - ARG 6 seed - ARG 8 chunkPos - ARG 9 world - ARG 10 biomePredicate - METHOD comp_561 dynamicRegistryManager ()Lnet/minecraft/class_5455; - METHOD comp_564 noiseConfig ()Lnet/minecraft/class_7138; - METHOD comp_565 structureManager ()Lnet/minecraft/class_3485; - METHOD comp_569 world ()Lnet/minecraft/class_5539; - METHOD comp_570 biomePredicate ()Ljava/util/function/Predicate; - METHOD method_41619 createChunkRandom (JLnet/minecraft/class_1923;)Lnet/minecraft/class_2919; - ARG 0 seed - ARG 2 chunkPos - CLASS class_7150 StructurePosition - METHOD (Lnet/minecraft/class_2338;Ljava/util/function/Consumer;)V - ARG 1 pos - ARG 2 generator - METHOD method_44019 generate ()Lnet/minecraft/class_6626; - METHOD method_44020 (Lnet/minecraft/class_6626;)Lnet/minecraft/class_6626; - ARG 0 collector - METHOD method_44021 (Ljava/util/function/Consumer;)Lnet/minecraft/class_6626; - ARG 0 generator - CLASS class_7302 Config - FIELD field_38430 CODEC Lcom/mojang/serialization/MapCodec; - METHOD method_42702 (Lcom/mojang/serialization/codecs/RecordCodecBuilder$Instance;)Lcom/mojang/datafixers/kinds/App; - ARG 0 instance +CLASS net/minecraft/class_7151 net/minecraft/world/gen/structure/StructureType + METHOD method_41623 register (Ljava/lang/String;Lcom/mojang/serialization/Codec;)Lnet/minecraft/class_7151; + ARG 0 id + ARG 1 codec diff --git a/mappings/net/minecraft/world/gen/structure/StructureTypes.mapping b/mappings/net/minecraft/world/gen/structure/Structures.mapping similarity index 98% rename from mappings/net/minecraft/world/gen/structure/StructureTypes.mapping rename to mappings/net/minecraft/world/gen/structure/Structures.mapping index 3bd126bb13..e6b4d058d7 100644 --- a/mappings/net/minecraft/world/gen/structure/StructureTypes.mapping +++ b/mappings/net/minecraft/world/gen/structure/Structures.mapping @@ -1,4 +1,4 @@ -CLASS net/minecraft/class_5470 net/minecraft/world/gen/structure/StructureTypes +CLASS net/minecraft/class_5470 net/minecraft/world/gen/structure/Structures FIELD field_26287 RUINED_PORTAL_JUNGLE Lnet/minecraft/class_6880; FIELD field_26288 RUINED_PORTAL_SWAMP Lnet/minecraft/class_6880; FIELD field_26289 RUINED_PORTAL_MOUNTAIN Lnet/minecraft/class_6880; @@ -33,7 +33,7 @@ CLASS net/minecraft/class_5470 net/minecraft/world/gen/structure/StructureTypes FIELD field_38476 ANCIENT_CITY Lnet/minecraft/class_6880; METHOD method_30603 register (Lnet/minecraft/class_5321;Lnet/minecraft/class_3195;)Lnet/minecraft/class_6880; ARG 0 key - ARG 1 configuredStructureFeature + ARG 1 structure METHOD method_38569 getDefault (Lnet/minecraft/class_2378;)Lnet/minecraft/class_6880; METHOD method_42044 getOrCreateBiomeTag (Lnet/minecraft/class_6862;)Lnet/minecraft/class_6885; ARG 0 key