From b172cf03c1e183e1b746a77dcbf1b65b66e3806e Mon Sep 17 00:00:00 2001 From: Mikhail Oleynikov Date: Tue, 10 Mar 2020 23:42:03 +0300 Subject: [PATCH] Extend structures and structure pools mappings (#1160) * Extend structures and structure pools mappings * Tweak isometry names; refine structure and structure pool names * Rename rotationCenter -> pivot * Update StructurePool.mapping * Update mappings/net/minecraft/structure/pool/StructurePool.mapping Co-Authored-By: liach <7806504+liach@users.noreply.github.com> Co-authored-by: liach <7806504+liach@users.noreply.github.com> --- .../net/minecraft/structure/Structure.mapping | 55 +++++++++++++++++++ .../structure/StructurePiece.mapping | 2 + .../structure/pool/FeaturePoolElement.mapping | 2 + .../structure/pool/ListPoolElement.mapping | 1 + .../structure/pool/SinglePoolElement.mapping | 3 + .../structure/pool/StructurePool.mapping | 2 + .../pool/StructurePoolElement.mapping | 3 + .../processor/StructureProcessor.mapping | 2 + .../processor/StructureProcessorRule.mapping | 2 + 9 files changed, 72 insertions(+) diff --git a/mappings/net/minecraft/structure/Structure.mapping b/mappings/net/minecraft/structure/Structure.mapping index da1dea9864..d30c3020d6 100644 --- a/mappings/net/minecraft/structure/Structure.mapping +++ b/mappings/net/minecraft/structure/Structure.mapping @@ -6,11 +6,31 @@ CLASS net/minecraft/class_3499 net/minecraft/structure/Structure METHOD method_15160 getSize ()Lnet/minecraft/class_2338; METHOD method_15161 setAuthor (Ljava/lang/String;)V ARG 1 name + METHOD method_15162 applyTransformedOffset (Lnet/minecraft/class_2338;Lnet/minecraft/class_2415;Lnet/minecraft/class_2470;II)Lnet/minecraft/class_2338; + ARG 3 offsetX + ARG 4 offsetZ METHOD method_15164 addEntitiesFromWorld (Lnet/minecraft/class_1937;Lnet/minecraft/class_2338;Lnet/minecraft/class_2338;)V ARG 1 world ARG 2 firstCorner ARG 3 secondCorner + METHOD method_15165 getInfosForBlock (Lnet/minecraft/class_2338;Lnet/minecraft/class_3492;Lnet/minecraft/class_2248;Z)Ljava/util/List; + ARG 1 pos + ARG 2 placementData + ARG 4 transformed + METHOD method_15166 getRotatedSize (Lnet/minecraft/class_2470;)Lnet/minecraft/class_2338; + METHOD method_15167 offsetByTransformedSize (Lnet/minecraft/class_2338;Lnet/minecraft/class_2415;Lnet/minecraft/class_2470;)Lnet/minecraft/class_2338; + METHOD method_15168 transformAround (Lnet/minecraft/class_2338;Lnet/minecraft/class_2415;Lnet/minecraft/class_2470;Lnet/minecraft/class_2338;)Lnet/minecraft/class_2338; + ARG 0 pos + ARG 3 pivot METHOD method_15169 createIntListTag ([I)Lnet/minecraft/class_2499; + METHOD method_15171 transform (Lnet/minecraft/class_3492;Lnet/minecraft/class_2338;)Lnet/minecraft/class_2338; + ARG 0 placementData + ARG 1 pos + METHOD method_15172 place (Lnet/minecraft/class_1936;Lnet/minecraft/class_2338;Lnet/minecraft/class_3492;I)Z + ARG 1 world + ARG 2 pos + ARG 3 placementData + ARG 4 flags METHOD method_15174 saveFromWorld (Lnet/minecraft/class_1937;Lnet/minecraft/class_2338;Lnet/minecraft/class_2338;ZLnet/minecraft/class_2248;)V ARG 1 world ARG 2 start @@ -19,19 +39,54 @@ CLASS net/minecraft/class_3499 net/minecraft/structure/Structure ARG 5 ignoredBlock METHOD method_15175 toTag (Lnet/minecraft/class_2487;)Lnet/minecraft/class_2487; ARG 1 tag + METHOD method_15176 transformAround (Lnet/minecraft/class_243;Lnet/minecraft/class_2415;Lnet/minecraft/class_2470;Lnet/minecraft/class_2338;)Lnet/minecraft/class_243; + ARG 0 point + ARG 3 pivot + METHOD method_15178 placeAndNotifyListeners (Lnet/minecraft/class_1936;Lnet/minecraft/class_2338;Lnet/minecraft/class_3492;)V + ARG 1 world + ARG 2 pos + ARG 3 data + METHOD method_15179 spawnEntities (Lnet/minecraft/class_1936;Lnet/minecraft/class_2338;Lnet/minecraft/class_2415;Lnet/minecraft/class_2470;Lnet/minecraft/class_2338;Lnet/minecraft/class_3341;)V + ARG 1 world + ARG 2 pos + ARG 5 pivot + ARG 6 area + METHOD method_15180 transformBox (Lnet/minecraft/class_3492;Lnet/minecraft/class_2338;Lnet/minecraft/class_3492;Lnet/minecraft/class_2338;)Lnet/minecraft/class_2338; + ARG 1 placementData1 + ARG 2 pos1 + ARG 3 placementData2 + ARG 4 pos2 METHOD method_15181 getAuthor ()Ljava/lang/String; METHOD method_15182 place (Lnet/minecraft/class_1936;Lnet/minecraft/class_2338;Lnet/minecraft/class_3492;)V + ARG 1 world + ARG 2 pos + ARG 3 placementData METHOD method_15183 fromTag (Lnet/minecraft/class_2487;)V ARG 1 tag METHOD method_15184 createDoubleListTag ([D)Lnet/minecraft/class_2499; + METHOD method_16186 mirrorBoundingBox (Lnet/minecraft/class_2470;IILnet/minecraft/class_3341;Lnet/minecraft/class_2350;Lnet/minecraft/class_2350;)V + ARG 1 rotation + ARG 2 offsetX + ARG 3 offsetZ + ARG 4 boundingBox METHOD method_16187 calculateBoundingBox (Lnet/minecraft/class_3492;Lnet/minecraft/class_2338;)Lnet/minecraft/class_3341; ARG 1 placementData ARG 2 pos + METHOD method_16445 getInfosForBlock (Lnet/minecraft/class_2338;Lnet/minecraft/class_3492;Lnet/minecraft/class_2248;)Ljava/util/List; + ARG 1 pos + ARG 2 placementData METHOD method_16446 process (Lnet/minecraft/class_1936;Lnet/minecraft/class_2338;Lnet/minecraft/class_3492;Ljava/util/List;)Ljava/util/List; ARG 0 world ARG 1 pos ARG 2 placementData ARG 3 blockInfos + METHOD method_17916 getEntity (Lnet/minecraft/class_1936;Lnet/minecraft/class_2487;)Ljava/util/Optional; + METHOD method_20532 updateCorner (Lnet/minecraft/class_1936;ILnet/minecraft/class_251;III)V + ARG 0 world + ARG 1 flags + ARG 3 startX + ARG 4 startY + ARG 5 startZ CLASS class_3500 Palette FIELD field_15590 AIR Lnet/minecraft/class_2680; FIELD field_15591 ids Lnet/minecraft/class_2361; diff --git a/mappings/net/minecraft/structure/StructurePiece.mapping b/mappings/net/minecraft/structure/StructurePiece.mapping index b00a244843..89b51c3851 100644 --- a/mappings/net/minecraft/structure/StructurePiece.mapping +++ b/mappings/net/minecraft/structure/StructurePiece.mapping @@ -120,6 +120,8 @@ CLASS net/minecraft/class_3443 net/minecraft/structure/StructurePiece ARG 7 z METHOD method_14946 getTag ()Lnet/minecraft/class_2487; METHOD method_16653 getType ()Lnet/minecraft/class_3773; + METHOD method_16654 intersectsChunk (Lnet/minecraft/class_1923;I)Z + ARG 2 offset METHOD method_16888 getRotation ()Lnet/minecraft/class_2470; CLASS class_3444 BlockRandomizer FIELD field_15317 block Lnet/minecraft/class_2680; diff --git a/mappings/net/minecraft/structure/pool/FeaturePoolElement.mapping b/mappings/net/minecraft/structure/pool/FeaturePoolElement.mapping index 6e7a0380aa..10675964b8 100644 --- a/mappings/net/minecraft/structure/pool/FeaturePoolElement.mapping +++ b/mappings/net/minecraft/structure/pool/FeaturePoolElement.mapping @@ -3,3 +3,5 @@ CLASS net/minecraft/class_3776 net/minecraft/structure/pool/FeaturePoolElement FIELD field_16662 tag Lnet/minecraft/class_2487; METHOD (Lnet/minecraft/class_2975;)V ARG 1 feature + METHOD method_16601 getStart (Lnet/minecraft/class_3485;Lnet/minecraft/class_2470;)Lnet/minecraft/class_2338; + METHOD method_19299 createDefaultJigsawTag ()Lnet/minecraft/class_2487; diff --git a/mappings/net/minecraft/structure/pool/ListPoolElement.mapping b/mappings/net/minecraft/structure/pool/ListPoolElement.mapping index 8a8bb76cd4..e907f2284c 100644 --- a/mappings/net/minecraft/structure/pool/ListPoolElement.mapping +++ b/mappings/net/minecraft/structure/pool/ListPoolElement.mapping @@ -1,2 +1,3 @@ CLASS net/minecraft/class_3782 net/minecraft/structure/pool/ListPoolElement FIELD field_16676 elements Ljava/util/List; + METHOD method_19307 setAllElementsProjection (Lnet/minecraft/class_3785$class_3786;)V diff --git a/mappings/net/minecraft/structure/pool/SinglePoolElement.mapping b/mappings/net/minecraft/structure/pool/SinglePoolElement.mapping index e39ad5083b..e8262b80a0 100644 --- a/mappings/net/minecraft/structure/pool/SinglePoolElement.mapping +++ b/mappings/net/minecraft/structure/pool/SinglePoolElement.mapping @@ -4,3 +4,6 @@ CLASS net/minecraft/class_3781 net/minecraft/structure/pool/SinglePoolElement METHOD (Ljava/lang/String;Ljava/util/List;)V ARG 1 location ARG 2 processors + METHOD method_16614 getDataStructureBlocks (Lnet/minecraft/class_3485;Lnet/minecraft/class_2338;Lnet/minecraft/class_2470;Z)Ljava/util/List; + ARG 4 mirroredAndRotated + METHOD method_16616 createPlacementData (Lnet/minecraft/class_2470;Lnet/minecraft/class_3341;)Lnet/minecraft/class_3492; diff --git a/mappings/net/minecraft/structure/pool/StructurePool.mapping b/mappings/net/minecraft/structure/pool/StructurePool.mapping index 464cde4037..440284ce58 100644 --- a/mappings/net/minecraft/structure/pool/StructurePool.mapping +++ b/mappings/net/minecraft/structure/pool/StructurePool.mapping @@ -6,6 +6,7 @@ CLASS net/minecraft/class_3785 net/minecraft/structure/pool/StructurePool FIELD field_16746 INVALID Lnet/minecraft/class_3785; FIELD field_16863 projection Lnet/minecraft/class_3785$class_3786; FIELD field_16864 elementCounts Lcom/google/common/collect/ImmutableList; + FIELD field_18707 highestY I METHOD (Lnet/minecraft/class_2960;Lnet/minecraft/class_2960;Ljava/util/List;Lnet/minecraft/class_3785$class_3786;)V ARG 1 id ARG 2 terminatorsId @@ -18,6 +19,7 @@ CLASS net/minecraft/class_3785 net/minecraft/structure/pool/StructurePool METHOD method_16633 getElementIndicesInRandomOrder (Ljava/util/Random;)Ljava/util/List; ARG 1 random METHOD method_16634 getTerminatorsId ()Lnet/minecraft/class_2960; + METHOD method_19309 getHighestY (Lnet/minecraft/class_3485;)I CLASS class_3786 Projection FIELD field_16682 id Ljava/lang/String; FIELD field_16684 PROJECTIONS_BY_ID Ljava/util/Map; diff --git a/mappings/net/minecraft/structure/pool/StructurePoolElement.mapping b/mappings/net/minecraft/structure/pool/StructurePoolElement.mapping index 3bfb63dc7f..7419468998 100644 --- a/mappings/net/minecraft/structure/pool/StructurePoolElement.mapping +++ b/mappings/net/minecraft/structure/pool/StructurePoolElement.mapping @@ -3,6 +3,7 @@ CLASS net/minecraft/class_3784 net/minecraft/structure/pool/StructurePoolElement 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_16625 rawToDynamic (Lcom/mojang/datafixers/types/DynamicOps;)Lcom/mojang/datafixers/Dynamic; METHOD method_16626 generate (Lnet/minecraft/class_3485;Lnet/minecraft/class_1936;Lnet/minecraft/class_2794;Lnet/minecraft/class_2338;Lnet/minecraft/class_2470;Lnet/minecraft/class_3341;Ljava/util/Random;)Z ARG 1 structureManager ARG 2 world @@ -15,4 +16,6 @@ CLASS net/minecraft/class_3784 net/minecraft/structure/pool/StructurePoolElement ARG 1 structureManager ARG 2 pos ARG 3 rotation + METHOD method_16755 toDynamic (Lcom/mojang/datafixers/types/DynamicOps;)Lcom/mojang/datafixers/Dynamic; METHOD method_16757 getType ()Lnet/minecraft/class_3816; + METHOD method_19308 getGroundLevelDelta ()I diff --git a/mappings/net/minecraft/structure/processor/StructureProcessor.mapping b/mappings/net/minecraft/structure/processor/StructureProcessor.mapping index ebde24e87b..b40f944546 100644 --- a/mappings/net/minecraft/structure/processor/StructureProcessor.mapping +++ b/mappings/net/minecraft/structure/processor/StructureProcessor.mapping @@ -2,4 +2,6 @@ CLASS net/minecraft/class_3491 net/minecraft/structure/processor/StructureProces METHOD method_15110 process (Lnet/minecraft/class_4538;Lnet/minecraft/class_2338;Lnet/minecraft/class_3499$class_3501;Lnet/minecraft/class_3499$class_3501;Lnet/minecraft/class_3492;)Lnet/minecraft/class_3499$class_3501; ARG 2 pos ARG 5 placementData + METHOD method_16666 rawToDynamic (Lcom/mojang/datafixers/types/DynamicOps;)Lcom/mojang/datafixers/Dynamic; + METHOD method_16771 toDynamic (Lcom/mojang/datafixers/types/DynamicOps;)Lcom/mojang/datafixers/Dynamic; METHOD method_16772 getType ()Lnet/minecraft/class_3828; diff --git a/mappings/net/minecraft/structure/processor/StructureProcessorRule.mapping b/mappings/net/minecraft/structure/processor/StructureProcessorRule.mapping index bbb92164eb..caee1f51f8 100644 --- a/mappings/net/minecraft/structure/processor/StructureProcessorRule.mapping +++ b/mappings/net/minecraft/structure/processor/StructureProcessorRule.mapping @@ -9,3 +9,5 @@ CLASS net/minecraft/class_3821 net/minecraft/structure/processor/StructureProces ARG 2 location ARG 3 random METHOD method_16763 getOutputState ()Lnet/minecraft/class_2680; + METHOD method_16764 toDynamic (Lcom/mojang/datafixers/types/DynamicOps;)Lcom/mojang/datafixers/Dynamic; + METHOD method_16765 fromDynamic (Lcom/mojang/datafixers/Dynamic;)Lnet/minecraft/class_3821;