From d924b0332556124fa0cc4c36b5ecdb0726de3567 Mon Sep 17 00:00:00 2001 From: liach <7806504+liach@users.noreply.github.com> Date: Fri, 28 Feb 2020 12:28:02 -0600 Subject: [PATCH] Eliminate all unmapped classes from yarn (#1135) Signed-off-by: liach --- .../client/render/RenderLayer.mapping | 4 +++ .../client/render/RenderPhase.mapping | 1 + .../structure/NetherFortressGenerator.mapping | 2 ++ .../structure/OceanMonumentGenerator.mapping | 34 +++++++++++++++++++ .../structure/StrongholdGenerator.mapping | 13 +++++++ .../net/minecraft/structure/Structure.mapping | 21 ++++++++++++ .../structure/StructurePiece.mapping | 1 + .../structure/StructurePlacementData.mapping | 14 +++++++- .../WoodlandMansionGenerator.mapping | 32 +++++++++++++++++ 9 files changed, 121 insertions(+), 1 deletion(-) diff --git a/mappings/net/minecraft/client/render/RenderLayer.mapping b/mappings/net/minecraft/client/render/RenderLayer.mapping index 98881a75b2..14e970ecef 100644 --- a/mappings/net/minecraft/client/render/RenderLayer.mapping +++ b/mappings/net/minecraft/client/render/RenderLayer.mapping @@ -33,6 +33,7 @@ CLASS net/minecraft/class_1921 net/minecraft/client/render/RenderLayer ARG 0 texture METHOD method_23031 getVertexFormat ()Lnet/minecraft/class_293; METHOD method_23033 getDrawMode ()I + METHOD method_23037 hasCrumbling ()Z METHOD method_23287 getOutline (Lnet/minecraft/class_2960;)Lnet/minecraft/class_1921; ARG 0 texture METHOD method_23289 getAffectedOutline ()Ljava/util/Optional; @@ -206,3 +207,6 @@ CLASS net/minecraft/class_1921 net/minecraft/client/render/RenderLayer METHOD method_24297 build (Lnet/minecraft/class_1921$class_4750;)Lnet/minecraft/class_1921$class_4688; ARG 1 outlineMode CLASS class_4750 OutlineMode + FIELD field_22243 name Ljava/lang/String; + METHOD (Ljava/lang/String;ILjava/lang/String;)V + ARG 3 name diff --git a/mappings/net/minecraft/client/render/RenderPhase.mapping b/mappings/net/minecraft/client/render/RenderPhase.mapping index 3ce2887fd1..2040d429f2 100644 --- a/mappings/net/minecraft/client/render/RenderPhase.mapping +++ b/mappings/net/minecraft/client/render/RenderPhase.mapping @@ -42,6 +42,7 @@ CLASS net/minecraft/class_4668 net/minecraft/client/render/RenderPhase FIELD field_21386 DISABLE_OVERLAY_COLOR Lnet/minecraft/class_4668$class_4679; FIELD field_21387 ENABLE_DIFFUSE_LIGHTING Lnet/minecraft/class_4668$class_4673; FIELD field_21388 DISABLE_DIFFUSE_LIGHTING Lnet/minecraft/class_4668$class_4673; + FIELD field_22241 VIEW_OFFSET_Z_LAYERING Lnet/minecraft/class_4668$class_4675; METHOD (Ljava/lang/String;Ljava/lang/Runnable;Ljava/lang/Runnable;)V ARG 1 name ARG 2 beginAction diff --git a/mappings/net/minecraft/structure/NetherFortressGenerator.mapping b/mappings/net/minecraft/structure/NetherFortressGenerator.mapping index 68decdcc53..b1525dc324 100644 --- a/mappings/net/minecraft/structure/NetherFortressGenerator.mapping +++ b/mappings/net/minecraft/structure/NetherFortressGenerator.mapping @@ -21,6 +21,8 @@ CLASS net/minecraft/class_3390 net/minecraft/structure/NetherFortressGenerator CLASS class_3402 BridgePlatform FIELD field_14498 hasBlazeSpawner Z CLASS class_3403 Piece + CLASS class_3404 PieceData + FIELD field_14501 pieceType Ljava/lang/Class; CLASS class_3405 BridgeSmallCrossing CLASS class_3406 BridgeStairs CLASS class_3407 Start diff --git a/mappings/net/minecraft/structure/OceanMonumentGenerator.mapping b/mappings/net/minecraft/structure/OceanMonumentGenerator.mapping index 773cd61216..6fb396cf05 100644 --- a/mappings/net/minecraft/structure/OceanMonumentGenerator.mapping +++ b/mappings/net/minecraft/structure/OceanMonumentGenerator.mapping @@ -1,5 +1,19 @@ CLASS net/minecraft/class_3366 net/minecraft/structure/OceanMonumentGenerator + CLASS class_3367 DoubleXRoomFactory + CLASS class_3368 DoubleXYRoomFactory + CLASS class_3369 DoubleYRoomFactory + CLASS class_3370 DoubleYZRoomFactory + CLASS class_3371 DoubleZRoomFactory + CLASS class_3372 SimpleRoomFactory + CLASS class_3373 SimpleRoomTopFactory CLASS class_3374 Base + CLASS class_3375 PieceFactory + METHOD method_14768 generate (Lnet/minecraft/class_2350;Lnet/minecraft/class_3366$class_3388;Ljava/util/Random;)Lnet/minecraft/class_3366$class_3384; + ARG 1 direction + ARG 2 setting + ARG 3 random + METHOD method_14769 canGenerate (Lnet/minecraft/class_3366$class_3388;)Z + ARG 1 setting CLASS class_3376 CoreRoom CLASS class_3377 DoubleXRoom CLASS class_3378 DoubleXYRoom @@ -9,12 +23,21 @@ CLASS net/minecraft/class_3366 net/minecraft/structure/OceanMonumentGenerator CLASS class_3382 Entry CLASS class_3383 Penthouse CLASS class_3384 Piece + FIELD field_14468 TWO_TWO_ZERO_INDEX I + FIELD field_14469 TWO_ZERO_ZERO_INDEX I FIELD field_14471 SEA_LANTERN Lnet/minecraft/class_2680; FIELD field_14472 ICE_BLOCKS Ljava/util/Set; FIELD field_14473 PRISMARINE Lnet/minecraft/class_2680; FIELD field_14474 DARK_PRISMARINE Lnet/minecraft/class_2680; FIELD field_14475 WATER Lnet/minecraft/class_2680; FIELD field_14476 PRISMARINE_BRICKS Lnet/minecraft/class_2680; + FIELD field_14477 FOUR_ONE_ZERO_INDEX I + FIELD field_14478 ZERO_ONE_ZERO_INDEX I + FIELD field_14479 setting Lnet/minecraft/class_3366$class_3388; + METHOD method_14770 getIndex (III)I + ARG 0 x + ARG 1 y + ARG 2 z METHOD method_14773 setAirAndWater (Lnet/minecraft/class_1936;Lnet/minecraft/class_3341;IIIIII)V ARG 1 world ARG 3 x @@ -26,3 +49,14 @@ CLASS net/minecraft/class_3366 net/minecraft/structure/OceanMonumentGenerator CLASS class_3385 SimpleRoom CLASS class_3386 SimpleRoomTop CLASS class_3387 WingRoom + CLASS class_3388 PieceSetting + FIELD field_14482 neighborPresences [Z + FIELD field_14485 used Z + FIELD field_14486 roomIndex I + FIELD field_14487 neighbors [Lnet/minecraft/class_3366$class_3388; + METHOD (I)V + ARG 1 index + METHOD method_14780 checkNeighborStates ()V + METHOD method_14781 countNeighbors ()I + METHOD method_14785 isAboveLevelThree ()Z + METHOD method_14786 setNeighbor (Lnet/minecraft/class_2350;Lnet/minecraft/class_3366$class_3388;)V diff --git a/mappings/net/minecraft/structure/StrongholdGenerator.mapping b/mappings/net/minecraft/structure/StrongholdGenerator.mapping index e0b70de2be..19849e2ce7 100644 --- a/mappings/net/minecraft/structure/StrongholdGenerator.mapping +++ b/mappings/net/minecraft/structure/StrongholdGenerator.mapping @@ -1,4 +1,9 @@ CLASS net/minecraft/class_3421 net/minecraft/structure/StrongholdGenerator + FIELD field_15263 STONE_BRICK_RANDOMIZER Lnet/minecraft/class_3421$class_3432; + FIELD field_15265 ALL_PIECE_SETTINGS [Lnet/minecraft/class_3421$class_3427; + FIELD field_15266 activePieceType Ljava/lang/Class; + FIELD field_15267 possiblePieceSettings Ljava/util/List; + METHOD method_14855 init ()V CLASS class_3422 ChestCorridor FIELD field_15268 chestGenerated Z CLASS class_3423 SmallCorridor @@ -11,6 +16,13 @@ CLASS net/minecraft/class_3421 net/minecraft/structure/StrongholdGenerator CLASS class_3425 LeftTurn CLASS class_3426 Library FIELD field_15274 tall Z + CLASS class_3427 PieceSetting + FIELD field_15275 limit I + FIELD field_15276 pieceType Ljava/lang/Class; + FIELD field_15277 generatedCount I + METHOD method_14861 canGenerate ()Z + METHOD method_14862 canGenerate (I)Z + ARG 1 depth CLASS class_3428 PortalRoom FIELD field_15279 spawnerPlaced Z CLASS class_3429 PrisonHall @@ -38,3 +50,4 @@ CLASS net/minecraft/class_3421 net/minecraft/structure/StrongholdGenerator ARG 6 y ARG 7 z CLASS class_3438 EntranceType + CLASS class_3466 Turn diff --git a/mappings/net/minecraft/structure/Structure.mapping b/mappings/net/minecraft/structure/Structure.mapping index 59a41bccb0..da1dea9864 100644 --- a/mappings/net/minecraft/structure/Structure.mapping +++ b/mappings/net/minecraft/structure/Structure.mapping @@ -6,7 +6,17 @@ 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_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_15169 createIntListTag ([I)Lnet/minecraft/class_2499; + 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 + ARG 3 size + ARG 4 includeEntities + ARG 5 ignoredBlock METHOD method_15175 toTag (Lnet/minecraft/class_2487;)Lnet/minecraft/class_2487; ARG 1 tag METHOD method_15181 getAuthor ()Ljava/lang/String; @@ -22,6 +32,17 @@ CLASS net/minecraft/class_3499 net/minecraft/structure/Structure ARG 1 pos ARG 2 placementData ARG 3 blockInfos + CLASS class_3500 Palette + FIELD field_15590 AIR Lnet/minecraft/class_2680; + FIELD field_15591 ids Lnet/minecraft/class_2361; + FIELD field_15592 currentIndex I + METHOD method_15185 getState (I)Lnet/minecraft/class_2680; + ARG 1 id + METHOD method_15186 set (Lnet/minecraft/class_2680;I)V + ARG 1 state + ARG 2 id + METHOD method_15187 getId (Lnet/minecraft/class_2680;)I + ARG 1 state CLASS class_3501 StructureBlockInfo FIELD field_15595 tag Lnet/minecraft/class_2487; FIELD field_15596 state Lnet/minecraft/class_2680; diff --git a/mappings/net/minecraft/structure/StructurePiece.mapping b/mappings/net/minecraft/structure/StructurePiece.mapping index 6ed943196e..b00a244843 100644 --- a/mappings/net/minecraft/structure/StructurePiece.mapping +++ b/mappings/net/minecraft/structure/StructurePiece.mapping @@ -9,6 +9,7 @@ CLASS net/minecraft/class_3443 net/minecraft/structure/StructurePiece FIELD field_16712 type Lnet/minecraft/class_3773; METHOD (Lnet/minecraft/class_3773;I)V ARG 1 type + ARG 2 length METHOD (Lnet/minecraft/class_3773;Lnet/minecraft/class_2487;)V ARG 1 type ARG 2 tag diff --git a/mappings/net/minecraft/structure/StructurePlacementData.mapping b/mappings/net/minecraft/structure/StructurePlacementData.mapping index b51da04c8e..e0c3a15940 100644 --- a/mappings/net/minecraft/structure/StructurePlacementData.mapping +++ b/mappings/net/minecraft/structure/StructurePlacementData.mapping @@ -8,28 +8,40 @@ CLASS net/minecraft/class_3492 net/minecraft/structure/StructurePlacementData FIELD field_15570 random Ljava/util/Random; FIELD field_15571 ignoreEntities Z FIELD field_16446 processors Ljava/util/List; + FIELD field_16587 updateNeighbors Z METHOD method_15112 setRandom (Ljava/util/Random;)Lnet/minecraft/class_3492; ARG 1 random METHOD method_15113 getRotation ()Lnet/minecraft/class_2470; METHOD method_15114 getMirror ()Lnet/minecraft/class_2415; METHOD method_15115 getRandom (Lnet/minecraft/class_2338;)Ljava/util/Random; ARG 1 pos + METHOD method_15117 getChunkBlockBox (Lnet/minecraft/class_1923;)Lnet/minecraft/class_3341; + ARG 1 pos METHOD method_15119 setPosition (Lnet/minecraft/class_2338;)Lnet/minecraft/class_3492; ARG 1 position METHOD method_15120 shouldPlaceFluids ()Z + METHOD method_15121 getRandomBlockInfos (Ljava/util/List;Lnet/minecraft/class_2338;)Ljava/util/List; METHOD method_15123 setRotation (Lnet/minecraft/class_2470;)Lnet/minecraft/class_3492; - METHOD method_15125 setMirrored (Lnet/minecraft/class_2415;)Lnet/minecraft/class_3492; + ARG 1 rotation + METHOD method_15124 getBoundingBox ()Lnet/minecraft/class_3341; + METHOD method_15125 setMirror (Lnet/minecraft/class_2415;)Lnet/minecraft/class_3492; + ARG 1 mirror METHOD method_15126 setBoundingBox (Lnet/minecraft/class_3341;)Lnet/minecraft/class_3492; ARG 1 boundingBox METHOD method_15128 copy ()Lnet/minecraft/class_3492; METHOD method_15130 setChunkPosition (Lnet/minecraft/class_1923;)Lnet/minecraft/class_3492; ARG 1 chunkPosition + METHOD method_15131 setUpdateNeighbors (Z)Lnet/minecraft/class_3492; + ARG 1 updateNeighbors + METHOD method_15132 calculateBoundingBox ()V METHOD method_15133 setIgnoreEntities (Z)Lnet/minecraft/class_3492; + ARG 1 ignoreEntities METHOD method_15134 getPosition ()Lnet/minecraft/class_2338; METHOD method_15135 shouldIgnoreEntities ()Z METHOD method_16182 getProcessors ()Ljava/util/List; METHOD method_16183 clearProcessors ()Lnet/minecraft/class_3492; METHOD method_16184 addProcessor (Lnet/minecraft/class_3491;)Lnet/minecraft/class_3492; ARG 1 processor + METHOD method_16444 shouldUpdateNeighbors ()Z METHOD method_16664 removeProcessor (Lnet/minecraft/class_3491;)Lnet/minecraft/class_3492; ARG 1 processor diff --git a/mappings/net/minecraft/structure/WoodlandMansionGenerator.mapping b/mappings/net/minecraft/structure/WoodlandMansionGenerator.mapping index e8e1a78cfb..87be87e84a 100644 --- a/mappings/net/minecraft/structure/WoodlandMansionGenerator.mapping +++ b/mappings/net/minecraft/structure/WoodlandMansionGenerator.mapping @@ -47,8 +47,40 @@ CLASS net/minecraft/class_3471 net/minecraft/structure/WoodlandMansionGenerator FIELD field_15449 position Lnet/minecraft/class_2338; FIELD field_15450 rotation Lnet/minecraft/class_2470; CLASS class_3477 SecondFloorRoomPool + CLASS class_3478 FlagMatrix + FIELD field_15451 array [[I + FIELD field_15452 fallback I + FIELD field_15453 m I + FIELD field_15454 n I + METHOD (III)V + ARG 1 n + ARG 2 m + ARG 3 fallback + METHOD method_15061 update (IIII)V + ARG 1 i + ARG 2 j + ARG 3 expected + ARG 4 newValue + METHOD method_15062 fill (IIIII)V + ARG 1 i0 + ARG 2 j0 + ARG 3 i1 + ARG 4 j1 + ARG 5 value + METHOD method_15065 set (III)V + ARG 1 i + ARG 2 j + ARG 3 value + METHOD method_15066 get (II)I + ARG 1 i + ARG 2 j + METHOD method_15067 anyMatchAround (III)Z + ARG 1 i + ARG 2 j + ARG 3 value CLASS class_3479 ThirdFloorRoomPool CLASS class_3480 Piece FIELD field_15455 template Ljava/lang/String; FIELD field_15456 mirror Lnet/minecraft/class_2415; FIELD field_15457 rotation Lnet/minecraft/class_2470; + METHOD method_15068 setupPlacement (Lnet/minecraft/class_3485;)V