diff --git a/build.gradle b/build.gradle index 1c6d6ae4c4..b48cdd8f9c 100644 --- a/build.gradle +++ b/build.gradle @@ -26,7 +26,7 @@ plugins { id 'net.fabricmc.filament' version '0.3.0' } -def minecraft_version = "21w37a" +def minecraft_version = "21w38a" def ENV = System.getenv() // Fetch build number from Github Actions diff --git a/mappings/net/minecraft/class_6350.mapping b/mappings/net/minecraft/class_6350.mapping deleted file mode 100644 index 54a1b5a530..0000000000 --- a/mappings/net/minecraft/class_6350.mapping +++ /dev/null @@ -1,3 +0,0 @@ -CLASS net/minecraft/class_6350 - CLASS class_6565 - METHOD computeFluid getFluidLevel (III)Lnet/minecraft/class_6350$class_6351; diff --git a/mappings/net/minecraft/class_6611.mapping b/mappings/net/minecraft/class_6611.mapping new file mode 100644 index 0000000000..0f6771c782 --- /dev/null +++ b/mappings/net/minecraft/class_6611.mapping @@ -0,0 +1,4 @@ +CLASS net/minecraft/class_6611 + METHOD method_37980 stop ()Ljava/nio/file/Path; + METHOD method_37981 start (Lnet/minecraft/class_6505$class_6506;)Z + METHOD method_37984 isProfiling ()Z diff --git a/mappings/net/minecraft/client/MinecraftClient.mapping b/mappings/net/minecraft/client/MinecraftClient.mapping index 510f8f0c1f..318cd88ad8 100644 --- a/mappings/net/minecraft/client/MinecraftClient.mapping +++ b/mappings/net/minecraft/client/MinecraftClient.mapping @@ -157,7 +157,7 @@ CLASS net/minecraft/class_310 net/minecraft/client/MinecraftClient FIELD field_26841 SOCIAL_INTERACTIONS_NOT_AVAILABLE Lnet/minecraft/class_2561; FIELD field_26842 socialInteractionsManager Lnet/minecraft/class_5520; FIELD field_26843 socialInteractionsToast Lnet/minecraft/class_372; - FIELD field_26902 socialInteractionsService Lcom/mojang/authlib/minecraft/SocialInteractionsService; + FIELD field_26902 socialInteractionsService Lcom/mojang/authlib/minecraft/UserApiService; FIELD field_27387 entityModelLoader Lnet/minecraft/class_5599; FIELD field_27388 blockEntityRenderDispatcher Lnet/minecraft/class_824; FIELD field_29569 recorder Lnet/minecraft/class_5962; @@ -416,7 +416,7 @@ CLASS net/minecraft/class_310 net/minecraft/client/MinecraftClient ARG 2 resourceName METHOD method_31320 getSocialInteractionsManager ()Lnet/minecraft/class_5520; METHOD method_31321 isConnectedToServer ()Z - METHOD method_31382 createSocialInteractionsService (Lcom/mojang/authlib/yggdrasil/YggdrasilAuthenticationService;Lnet/minecraft/class_542;)Lcom/mojang/authlib/minecraft/SocialInteractionsService; + METHOD method_31382 createSocialInteractionsService (Lcom/mojang/authlib/yggdrasil/YggdrasilAuthenticationService;Lnet/minecraft/class_542;)Lcom/mojang/authlib/minecraft/UserApiService; ARG 2 runArgs METHOD method_31974 getEntityModelLoader ()Lnet/minecraft/class_5599; METHOD method_31975 getBlockEntityRenderDispatcher ()Lnet/minecraft/class_824; diff --git a/mappings/net/minecraft/client/network/ClientPlayNetworkHandler.mapping b/mappings/net/minecraft/client/network/ClientPlayNetworkHandler.mapping index 91128a09ba..83a11be928 100644 --- a/mappings/net/minecraft/client/network/ClientPlayNetworkHandler.mapping +++ b/mappings/net/minecraft/client/network/ClientPlayNetworkHandler.mapping @@ -20,7 +20,7 @@ CLASS net/minecraft/class_634 net/minecraft/client/network/ClientPlayNetworkHand FIELD field_3699 world Lnet/minecraft/class_638; FIELD field_3700 advancementHandler Lnet/minecraft/class_632; FIELD field_3701 loginScreen Lnet/minecraft/class_437; - METHOD (Lnet/minecraft/class_310;Lnet/minecraft/class_437;Lnet/minecraft/class_2535;Lcom/mojang/authlib/GameProfile;)V + METHOD (Lnet/minecraft/class_310;Lnet/minecraft/class_437;Lnet/minecraft/class_2535;Lcom/mojang/authlib/GameProfile;Lnet/minecraft/class_6628;)V ARG 1 client ARG 2 screen ARG 3 connection diff --git a/mappings/net/minecraft/client/network/SocialInteractionsManager.mapping b/mappings/net/minecraft/client/network/SocialInteractionsManager.mapping index ad0a9a5d90..fd2d736644 100644 --- a/mappings/net/minecraft/client/network/SocialInteractionsManager.mapping +++ b/mappings/net/minecraft/client/network/SocialInteractionsManager.mapping @@ -1,11 +1,10 @@ CLASS net/minecraft/class_5520 net/minecraft/client/network/SocialInteractionsManager FIELD field_26865 client Lnet/minecraft/class_310; FIELD field_26866 hiddenPlayers Ljava/util/Set; - FIELD field_26912 socialInteractionsService Lcom/mojang/authlib/minecraft/SocialInteractionsService; + FIELD field_26912 socialInteractionsService Lcom/mojang/authlib/minecraft/UserApiService; FIELD field_26927 playerNameByUuid Ljava/util/Map; - METHOD (Lnet/minecraft/class_310;Lcom/mojang/authlib/minecraft/SocialInteractionsService;)V + METHOD (Lnet/minecraft/class_310;Lcom/mojang/authlib/minecraft/UserApiService;)V ARG 1 client - ARG 2 socialInteractionsService METHOD method_31336 getHiddenPlayers ()Ljava/util/Set; METHOD method_31337 setPlayerOnline (Lnet/minecraft/class_640;)V ARG 1 player diff --git a/mappings/net/minecraft/client/option/Option.mapping b/mappings/net/minecraft/client/option/Option.mapping index 938cbec991..ef30c0d417 100644 --- a/mappings/net/minecraft/client/option/Option.mapping +++ b/mappings/net/minecraft/client/option/Option.mapping @@ -306,11 +306,11 @@ CLASS net/minecraft/class_316 net/minecraft/client/option/Option ARG 2 hideMatchedNames METHOD method_32534 (Lnet/minecraft/class_315;)Lnet/minecraft/class_5365; ARG 0 gameOptions - METHOD method_32535 (Lnet/minecraft/class_315;)Lnet/minecraft/class_1659; + METHOD method_32535 (Lnet/minecraft/class_315;)Lnet/minecraft/class_4061; ARG 0 gameOptions - METHOD method_32536 (Lnet/minecraft/class_315;)Lnet/minecraft/class_4061; + METHOD method_32536 (Lnet/minecraft/class_315;)Lnet/minecraft/class_6597; ARG 0 gameOptions - METHOD method_32537 (Lnet/minecraft/class_315;)Lnet/minecraft/class_4060; + METHOD method_32537 (Lnet/minecraft/class_315;)Lnet/minecraft/class_1659; ARG 0 gameOptions METHOD method_32538 (Lnet/minecraft/class_315;)Ljava/lang/Boolean; ARG 0 gameOptions @@ -334,18 +334,16 @@ CLASS net/minecraft/class_316 net/minecraft/client/option/Option ARG 0 gameOptions ARG 1 option ARG 2 mainArm - METHOD method_32548 (Lnet/minecraft/class_315;Lnet/minecraft/class_316;Lnet/minecraft/class_1659;)V + METHOD method_32548 (Lnet/minecraft/class_315;Lnet/minecraft/class_316;Lnet/minecraft/class_4061;)V ARG 0 gameOptions ARG 1 option - ARG 2 chatVisibility METHOD method_32549 (Lnet/minecraft/class_315;Lnet/minecraft/class_316;Lnet/minecraft/class_4060;)V ARG 0 gameOptions ARG 1 option ARG 2 aoMode - METHOD method_32550 (Lnet/minecraft/class_315;Lnet/minecraft/class_316;Lnet/minecraft/class_4061;)V + METHOD method_32550 (Lnet/minecraft/class_315;Lnet/minecraft/class_316;Lnet/minecraft/class_6597;)V ARG 0 gameOptions ARG 1 option - ARG 2 attackIndicator METHOD method_32551 (Lnet/minecraft/class_315;Lnet/minecraft/class_316;Lnet/minecraft/class_4063;)V ARG 0 gameOptions ARG 1 option @@ -436,13 +434,13 @@ CLASS net/minecraft/class_316 net/minecraft/client/option/Option ARG 0 gameOptions ARG 1 option ARG 2 backgroundForChatOnly - METHOD method_32589 (Lnet/minecraft/class_315;)Lnet/minecraft/class_4063; + METHOD method_32589 (Lnet/minecraft/class_315;)Lnet/minecraft/class_4066; ARG 0 gameOptions - METHOD method_32590 (Lnet/minecraft/class_315;)Lnet/minecraft/class_4066; + METHOD method_32590 (Lnet/minecraft/class_315;)Lnet/minecraft/class_4065; ARG 0 gameOptions - METHOD method_32591 (Lnet/minecraft/class_315;)Lnet/minecraft/class_4065; + METHOD method_32591 (Lnet/minecraft/class_315;)Lnet/minecraft/class_1306; ARG 0 gameOptions - METHOD method_32592 (Lnet/minecraft/class_315;)Lnet/minecraft/class_1306; + METHOD method_32592 (Lnet/minecraft/class_315;)Lnet/minecraft/class_4063; ARG 0 gameOptions METHOD method_32593 (Lnet/minecraft/class_315;)Ljava/lang/Integer; ARG 0 gameOptions @@ -454,14 +452,13 @@ CLASS net/minecraft/class_316 net/minecraft/client/option/Option ARG 2 monochromeLogo METHOD method_38511 (Lnet/minecraft/class_315;)Ljava/lang/String; ARG 0 gameOptions - METHOD method_38512 (Lnet/minecraft/class_315;)Lnet/minecraft/class_6597; + METHOD method_38512 (Lnet/minecraft/class_315;)Lnet/minecraft/class_4060; ARG 0 gameOptions METHOD method_38513 (Lnet/minecraft/class_315;)Ljava/lang/Boolean; ARG 0 gameOptions - METHOD method_38514 (Lnet/minecraft/class_315;Lnet/minecraft/class_316;Lnet/minecraft/class_6597;)V + METHOD method_38514 (Lnet/minecraft/class_315;Lnet/minecraft/class_316;Lnet/minecraft/class_1659;)V ARG 0 gameOptions ARG 1 option - ARG 2 prioritizeChunkUpdatesMode METHOD method_38515 (Lnet/minecraft/class_315;Lnet/minecraft/class_316;Ljava/lang/Boolean;)V ARG 0 gameOptions ARG 1 option diff --git a/mappings/net/minecraft/client/render/WorldRenderer.mapping b/mappings/net/minecraft/client/render/WorldRenderer.mapping index a2245eebb9..4b2e64e23d 100644 --- a/mappings/net/minecraft/client/render/WorldRenderer.mapping +++ b/mappings/net/minecraft/client/render/WorldRenderer.mapping @@ -356,10 +356,7 @@ CLASS net/minecraft/class_761 net/minecraft/client/render/WorldRenderer ARG 2 cause CLASS class_5972 ChunkInfoList FIELD field_29620 current [Lnet/minecraft/class_761$class_762; - FIELD field_29621 pending [Lnet/minecraft/class_761$class_762; - METHOD method_34818 update ()V METHOD method_34820 getInfo (Lnet/minecraft/class_846$class_851;)Lnet/minecraft/class_761$class_762; - ARG 1 chunk METHOD method_34821 setInfo (Lnet/minecraft/class_846$class_851;Lnet/minecraft/class_761$class_762;)V ARG 1 chunk ARG 2 info diff --git a/mappings/net/minecraft/client/util/Session.mapping b/mappings/net/minecraft/client/util/Session.mapping index a3b96100c4..03e674e843 100644 --- a/mappings/net/minecraft/client/util/Session.mapping +++ b/mappings/net/minecraft/client/util/Session.mapping @@ -3,11 +3,10 @@ CLASS net/minecraft/class_320 net/minecraft/client/util/Session FIELD field_1983 accessToken Ljava/lang/String; FIELD field_1984 accountType Lnet/minecraft/class_320$class_321; FIELD field_1985 uuid Ljava/lang/String; - METHOD (Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;)V + METHOD (Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/util/Optional;Ljava/util/Optional;Lnet/minecraft/class_320$class_321;)V ARG 1 username ARG 2 uuid ARG 3 accessToken - ARG 4 accountType METHOD method_1673 getUuid ()Ljava/lang/String; METHOD method_1674 getAccessToken ()Ljava/lang/String; METHOD method_1675 getSessionId ()Ljava/lang/String; diff --git a/mappings/net/minecraft/server/world/ChunkTicketManager.mapping b/mappings/net/minecraft/server/world/ChunkTicketManager.mapping index f64cfe5676..e8d1b1322c 100644 --- a/mappings/net/minecraft/server/world/ChunkTicketManager.mapping +++ b/mappings/net/minecraft/server/world/ChunkTicketManager.mapping @@ -19,7 +19,6 @@ CLASS net/minecraft/class_3204 net/minecraft/server/world/ChunkTicketManager METHOD method_14035 isUnloaded (J)Z ARG 1 pos METHOD method_14036 setChunkForced (Lnet/minecraft/class_1923;Z)V - ARG 1 pos ARG 2 forced METHOD method_14038 getChunkHolder (J)Lnet/minecraft/class_3193; ARG 1 pos @@ -56,7 +55,6 @@ CLASS net/minecraft/class_3204 net/minecraft/server/world/ChunkTicketManager ARG 4 argument METHOD method_17292 removeTicket (Lnet/minecraft/class_3230;Lnet/minecraft/class_1923;ILjava/lang/Object;)V ARG 1 type - ARG 2 pos ARG 3 radius ARG 4 argument METHOD method_17645 removeTicket (JLnet/minecraft/class_3228;)V diff --git a/mappings/net/minecraft/server/world/ServerChunkManager.mapping b/mappings/net/minecraft/server/world/ServerChunkManager.mapping index ecedc2305b..fd32cddf68 100644 --- a/mappings/net/minecraft/server/world/ServerChunkManager.mapping +++ b/mappings/net/minecraft/server/world/ServerChunkManager.mapping @@ -14,7 +14,7 @@ CLASS net/minecraft/class_3215 net/minecraft/server/world/ServerChunkManager FIELD field_19336 chunkStatusCache [Lnet/minecraft/class_2806; FIELD field_19337 chunkCache [Lnet/minecraft/class_2791; FIELD field_24455 spawnInfo Lnet/minecraft/class_1948$class_5262; - METHOD (Lnet/minecraft/class_3218;Lnet/minecraft/class_32$class_5143;Lcom/mojang/datafixers/DataFixer;Lnet/minecraft/class_3485;Ljava/util/concurrent/Executor;Lnet/minecraft/class_2794;IZLnet/minecraft/class_3949;Lnet/minecraft/class_5567;Ljava/util/function/Supplier;)V + METHOD (Lnet/minecraft/class_3218;Lnet/minecraft/class_32$class_5143;Lcom/mojang/datafixers/DataFixer;Lnet/minecraft/class_3485;Ljava/util/concurrent/Executor;Lnet/minecraft/class_2794;IIZLnet/minecraft/class_3949;Lnet/minecraft/class_5567;Ljava/util/function/Supplier;)V ARG 1 world ARG 2 session ARG 3 dataFixer @@ -22,7 +22,6 @@ CLASS net/minecraft/class_3215 net/minecraft/server/world/ServerChunkManager ARG 5 workerExecutor ARG 6 chunkGenerator ARG 7 viewDistance - ARG 9 worldGenerationProgressListener METHOD method_12129 getChunkGenerator ()Lnet/minecraft/class_2794; METHOD method_14096 updatePosition (Lnet/minecraft/class_3222;)V COMMENT Updates the chunk section position of the {@code player}. This can either be a diff --git a/mappings/net/minecraft/structure/BuriedTreasureGenerator.mapping b/mappings/net/minecraft/structure/BuriedTreasureGenerator.mapping index 281243c0d0..ec401b7aec 100644 --- a/mappings/net/minecraft/structure/BuriedTreasureGenerator.mapping +++ b/mappings/net/minecraft/structure/BuriedTreasureGenerator.mapping @@ -2,8 +2,5 @@ CLASS net/minecraft/class_3789 net/minecraft/structure/BuriedTreasureGenerator CLASS class_3339 Piece METHOD (Lnet/minecraft/class_2338;)V ARG 1 pos - METHOD (Lnet/minecraft/class_3218;Lnet/minecraft/class_2487;)V - ARG 1 world - ARG 2 nbt METHOD method_14655 isLiquid (Lnet/minecraft/class_2680;)Z ARG 1 state diff --git a/mappings/net/minecraft/structure/DesertTempleGenerator.mapping b/mappings/net/minecraft/structure/DesertTempleGenerator.mapping index 0a05a5e098..aeb750940b 100644 --- a/mappings/net/minecraft/structure/DesertTempleGenerator.mapping +++ b/mappings/net/minecraft/structure/DesertTempleGenerator.mapping @@ -4,6 +4,3 @@ CLASS net/minecraft/class_3346 net/minecraft/structure/DesertTempleGenerator ARG 1 random ARG 2 x ARG 3 z - METHOD (Lnet/minecraft/class_3218;Lnet/minecraft/class_2487;)V - ARG 1 world - ARG 2 nbt diff --git a/mappings/net/minecraft/structure/EndCityGenerator.mapping b/mappings/net/minecraft/structure/EndCityGenerator.mapping index 31925c3592..67c76cd96c 100644 --- a/mappings/net/minecraft/structure/EndCityGenerator.mapping +++ b/mappings/net/minecraft/structure/EndCityGenerator.mapping @@ -33,8 +33,6 @@ CLASS net/minecraft/class_3342 net/minecraft/structure/EndCityGenerator CLASS 3 FIELD field_14394 shipGenerated Z CLASS class_3343 Piece - METHOD (Lnet/minecraft/class_3218;Lnet/minecraft/class_2487;)V - ARG 1 world METHOD (Lnet/minecraft/class_3485;Ljava/lang/String;Lnet/minecraft/class_2338;Lnet/minecraft/class_2470;Z)V ARG 1 manager ARG 2 template diff --git a/mappings/net/minecraft/structure/IglooGenerator.mapping b/mappings/net/minecraft/structure/IglooGenerator.mapping index 1b502ea3c1..73c23d3c0d 100644 --- a/mappings/net/minecraft/structure/IglooGenerator.mapping +++ b/mappings/net/minecraft/structure/IglooGenerator.mapping @@ -10,8 +10,7 @@ CLASS net/minecraft/class_3351 net/minecraft/structure/IglooGenerator ARG 2 rotation ARG 4 random CLASS class_3352 Piece - METHOD (Lnet/minecraft/class_3218;Lnet/minecraft/class_2487;)V - ARG 1 world + METHOD (Lnet/minecraft/class_3485;Lnet/minecraft/class_2487;)V ARG 2 nbt METHOD (Lnet/minecraft/class_3485;Lnet/minecraft/class_2960;Lnet/minecraft/class_2338;Lnet/minecraft/class_2470;I)V ARG 1 manager diff --git a/mappings/net/minecraft/structure/JungleTempleGenerator.mapping b/mappings/net/minecraft/structure/JungleTempleGenerator.mapping index f5741a7362..ca9f471e22 100644 --- a/mappings/net/minecraft/structure/JungleTempleGenerator.mapping +++ b/mappings/net/minecraft/structure/JungleTempleGenerator.mapping @@ -8,7 +8,4 @@ CLASS net/minecraft/class_3348 net/minecraft/structure/JungleTempleGenerator ARG 1 random ARG 2 x ARG 3 z - METHOD (Lnet/minecraft/class_3218;Lnet/minecraft/class_2487;)V - ARG 1 world - ARG 2 nbt CLASS class_3349 CobblestoneRandomizer diff --git a/mappings/net/minecraft/structure/MineshaftGenerator.mapping b/mappings/net/minecraft/structure/MineshaftGenerator.mapping index 907ec39355..8398a3656b 100644 --- a/mappings/net/minecraft/structure/MineshaftGenerator.mapping +++ b/mappings/net/minecraft/structure/MineshaftGenerator.mapping @@ -27,9 +27,6 @@ CLASS net/minecraft/class_3353 net/minecraft/structure/MineshaftGenerator ARG 3 boundingBox ARG 4 orientation ARG 5 type - METHOD (Lnet/minecraft/class_3218;Lnet/minecraft/class_2487;)V - ARG 1 world - ARG 2 nbt METHOD method_14713 generateSupports (Lnet/minecraft/class_5281;Lnet/minecraft/class_3341;IIIIILjava/util/Random;)V ARG 1 world ARG 2 boundingBox @@ -93,9 +90,6 @@ CLASS net/minecraft/class_3353 net/minecraft/structure/MineshaftGenerator ARG 2 boundingBox ARG 3 orientation ARG 4 type - METHOD (Lnet/minecraft/class_3218;Lnet/minecraft/class_2487;)V - ARG 1 world - ARG 2 nbt METHOD method_14716 generateCrossingPillar (Lnet/minecraft/class_5281;Lnet/minecraft/class_3341;IIII)V ARG 1 world ARG 2 boundingBox @@ -141,18 +135,12 @@ CLASS net/minecraft/class_3353 net/minecraft/structure/MineshaftGenerator ARG 3 x ARG 4 z ARG 5 type - METHOD (Lnet/minecraft/class_3218;Lnet/minecraft/class_2487;)V - ARG 1 world - ARG 2 nbt CLASS class_3358 MineshaftStairs METHOD (ILnet/minecraft/class_3341;Lnet/minecraft/class_2350;Lnet/minecraft/class_3098$class_3100;)V ARG 1 chainLength ARG 2 boundingBox ARG 3 orientation ARG 4 type - METHOD (Lnet/minecraft/class_3218;Lnet/minecraft/class_2487;)V - ARG 1 world - ARG 2 nbt METHOD method_14720 getBoundingBox (Lnet/minecraft/class_6130;Ljava/util/Random;IIILnet/minecraft/class_2350;)Lnet/minecraft/class_3341; ARG 1 random ARG 2 x diff --git a/mappings/net/minecraft/structure/NetherFortressGenerator.mapping b/mappings/net/minecraft/structure/NetherFortressGenerator.mapping index aaf4a5fb56..b28d8e0d40 100644 --- a/mappings/net/minecraft/structure/NetherFortressGenerator.mapping +++ b/mappings/net/minecraft/structure/NetherFortressGenerator.mapping @@ -21,9 +21,6 @@ CLASS net/minecraft/class_3390 net/minecraft/structure/NetherFortressGenerator ARG 1 chainLength ARG 2 boundingBox ARG 3 orientation - METHOD (Lnet/minecraft/class_3218;Lnet/minecraft/class_2487;)V - ARG 1 world - ARG 2 nbt METHOD method_14796 create (Lnet/minecraft/class_6130;IIILnet/minecraft/class_2350;I)Lnet/minecraft/class_3390$class_3391; ARG 1 x ARG 2 y @@ -40,9 +37,6 @@ CLASS net/minecraft/class_3390 net/minecraft/structure/NetherFortressGenerator ARG 2 random ARG 3 boundingBox ARG 4 orientation - METHOD (Lnet/minecraft/class_3218;Lnet/minecraft/class_2487;)V - ARG 1 world - ARG 2 nbt METHOD method_14797 create (Lnet/minecraft/class_6130;Ljava/util/Random;IIILnet/minecraft/class_2350;I)Lnet/minecraft/class_3390$class_3392; ARG 1 random ARG 2 x @@ -59,9 +53,6 @@ CLASS net/minecraft/class_3390 net/minecraft/structure/NetherFortressGenerator ARG 2 random ARG 3 boundingBox ARG 4 orientation - METHOD (Lnet/minecraft/class_3218;Lnet/minecraft/class_2487;)V - ARG 1 world - ARG 2 nbt METHOD method_14798 create (Lnet/minecraft/class_6130;Ljava/util/Random;IIILnet/minecraft/class_2350;I)Lnet/minecraft/class_3390$class_3393; ARG 1 random ARG 2 x @@ -77,9 +68,6 @@ CLASS net/minecraft/class_3390 net/minecraft/structure/NetherFortressGenerator ARG 1 chainLength ARG 2 boundingBox ARG 3 orientation - METHOD (Lnet/minecraft/class_3218;Lnet/minecraft/class_2487;)V - ARG 1 world - ARG 2 nbt METHOD method_14799 create (Lnet/minecraft/class_6130;IIILnet/minecraft/class_2350;I)Lnet/minecraft/class_3390$class_3394; ARG 1 x ARG 2 y @@ -94,9 +82,6 @@ CLASS net/minecraft/class_3390 net/minecraft/structure/NetherFortressGenerator ARG 1 chainLength ARG 2 boundingBox ARG 3 orientation - METHOD (Lnet/minecraft/class_3218;Lnet/minecraft/class_2487;)V - ARG 1 world - ARG 2 nbt METHOD method_14800 create (Lnet/minecraft/class_6130;IIILnet/minecraft/class_2350;I)Lnet/minecraft/class_3390$class_3395; ARG 1 x ARG 2 y @@ -112,9 +97,6 @@ CLASS net/minecraft/class_3390 net/minecraft/structure/NetherFortressGenerator ARG 2 random ARG 3 boundingBox ARG 4 orientation - METHOD (Lnet/minecraft/class_3218;Lnet/minecraft/class_2487;)V - ARG 1 world - ARG 2 nbt METHOD method_14801 create (Lnet/minecraft/class_6130;Ljava/util/Random;IIILnet/minecraft/class_2350;I)Lnet/minecraft/class_3390$class_3396; ARG 1 random ARG 2 x @@ -130,9 +112,6 @@ CLASS net/minecraft/class_3390 net/minecraft/structure/NetherFortressGenerator ARG 1 chainLength ARG 2 boundingBox ARG 3 orientation - METHOD (Lnet/minecraft/class_3218;Lnet/minecraft/class_2487;)V - ARG 1 world - ARG 2 nbt METHOD method_14802 create (Lnet/minecraft/class_6130;IIILnet/minecraft/class_2350;I)Lnet/minecraft/class_3390$class_3397; ARG 1 x ARG 2 y @@ -149,9 +128,6 @@ CLASS net/minecraft/class_3390 net/minecraft/structure/NetherFortressGenerator ARG 2 random ARG 3 boundingBox ARG 4 orientation - METHOD (Lnet/minecraft/class_3218;Lnet/minecraft/class_2487;)V - ARG 1 world - ARG 2 nbt METHOD method_14803 create (Lnet/minecraft/class_6130;Ljava/util/Random;IIILnet/minecraft/class_2350;I)Lnet/minecraft/class_3390$class_3398; ARG 1 random ARG 2 x @@ -167,9 +143,6 @@ CLASS net/minecraft/class_3390 net/minecraft/structure/NetherFortressGenerator ARG 1 chainLength ARG 2 boundingBox ARG 3 orientation - METHOD (Lnet/minecraft/class_3218;Lnet/minecraft/class_2487;)V - ARG 1 world - ARG 2 nbt METHOD method_14804 create (Lnet/minecraft/class_6130;IIILnet/minecraft/class_2350;I)Lnet/minecraft/class_3390$class_3399; ARG 1 x ARG 2 y @@ -186,9 +159,6 @@ CLASS net/minecraft/class_3390 net/minecraft/structure/NetherFortressGenerator ARG 2 random ARG 3 boundingBox ARG 4 orientation - METHOD (Lnet/minecraft/class_3218;Lnet/minecraft/class_2487;)V - ARG 1 world - ARG 2 nbt METHOD method_14805 create (Lnet/minecraft/class_6130;Ljava/util/Random;IIILnet/minecraft/class_2350;I)Lnet/minecraft/class_3390$class_3400; ARG 1 random ARG 2 x @@ -204,9 +174,6 @@ CLASS net/minecraft/class_3390 net/minecraft/structure/NetherFortressGenerator ARG 1 chainLength ARG 2 boundingBox ARG 3 orientation - METHOD (Lnet/minecraft/class_3218;Lnet/minecraft/class_2487;)V - ARG 1 world - ARG 2 nbt METHOD method_14806 create (Lnet/minecraft/class_6130;IIILnet/minecraft/class_2350;I)Lnet/minecraft/class_3390$class_3401; ARG 1 x ARG 2 y @@ -222,9 +189,6 @@ CLASS net/minecraft/class_3390 net/minecraft/structure/NetherFortressGenerator ARG 1 chainLength ARG 2 boundingBox ARG 3 orientation - METHOD (Lnet/minecraft/class_3218;Lnet/minecraft/class_2487;)V - ARG 1 world - ARG 2 nbt METHOD method_14807 create (Lnet/minecraft/class_6130;IIIILnet/minecraft/class_2350;)Lnet/minecraft/class_3390$class_3402; ARG 1 x ARG 2 y @@ -298,9 +262,6 @@ CLASS net/minecraft/class_3390 net/minecraft/structure/NetherFortressGenerator ARG 1 chainLength ARG 2 boundingBox ARG 3 orientation - METHOD (Lnet/minecraft/class_3218;Lnet/minecraft/class_2487;)V - ARG 1 world - ARG 2 nbt METHOD method_14817 create (Lnet/minecraft/class_6130;IIILnet/minecraft/class_2350;I)Lnet/minecraft/class_3390$class_3405; ARG 1 x ARG 2 y @@ -315,9 +276,6 @@ CLASS net/minecraft/class_3390 net/minecraft/structure/NetherFortressGenerator ARG 1 chainLength ARG 2 boundingBox ARG 3 orientation - METHOD (Lnet/minecraft/class_3218;Lnet/minecraft/class_2487;)V - ARG 1 world - ARG 2 nbt METHOD method_14818 create (Lnet/minecraft/class_6130;IIIILnet/minecraft/class_2350;)Lnet/minecraft/class_3390$class_3406; ARG 1 x ARG 2 y diff --git a/mappings/net/minecraft/structure/NetherFossilGenerator.mapping b/mappings/net/minecraft/structure/NetherFossilGenerator.mapping index e40c7c46fb..97c5d50029 100644 --- a/mappings/net/minecraft/structure/NetherFossilGenerator.mapping +++ b/mappings/net/minecraft/structure/NetherFossilGenerator.mapping @@ -5,8 +5,7 @@ CLASS net/minecraft/class_4787 net/minecraft/structure/NetherFossilGenerator ARG 2 random ARG 3 pos CLASS class_4788 Piece - METHOD (Lnet/minecraft/class_3218;Lnet/minecraft/class_2487;)V - ARG 1 world + METHOD (Lnet/minecraft/class_3485;Lnet/minecraft/class_2487;)V ARG 2 nbt METHOD (Lnet/minecraft/class_3485;Lnet/minecraft/class_2960;Lnet/minecraft/class_2338;Lnet/minecraft/class_2470;)V ARG 1 manager diff --git a/mappings/net/minecraft/structure/OceanMonumentGenerator.mapping b/mappings/net/minecraft/structure/OceanMonumentGenerator.mapping index f4c6be1acf..0e8ffa4e3e 100644 --- a/mappings/net/minecraft/structure/OceanMonumentGenerator.mapping +++ b/mappings/net/minecraft/structure/OceanMonumentGenerator.mapping @@ -12,9 +12,6 @@ CLASS net/minecraft/class_3366 net/minecraft/structure/OceanMonumentGenerator ARG 2 x ARG 3 z ARG 4 orientation - METHOD (Lnet/minecraft/class_3218;Lnet/minecraft/class_2487;)V - ARG 1 world - ARG 2 nbt METHOD method_14760 (Ljava/util/Random;)Ljava/util/List; ARG 1 random METHOD method_14761 (ZILnet/minecraft/class_5281;Ljava/util/Random;Lnet/minecraft/class_3341;)V @@ -56,58 +53,34 @@ CLASS net/minecraft/class_3366 net/minecraft/structure/OceanMonumentGenerator METHOD (Lnet/minecraft/class_2350;Lnet/minecraft/class_3366$class_3388;)V ARG 1 orientation ARG 2 setting - METHOD (Lnet/minecraft/class_3218;Lnet/minecraft/class_2487;)V - ARG 1 world - ARG 2 nbt CLASS class_3377 DoubleXRoom METHOD (Lnet/minecraft/class_2350;Lnet/minecraft/class_3366$class_3388;)V ARG 1 orientation ARG 2 setting - METHOD (Lnet/minecraft/class_3218;Lnet/minecraft/class_2487;)V - ARG 1 world - ARG 2 nbt CLASS class_3378 DoubleXYRoom METHOD (Lnet/minecraft/class_2350;Lnet/minecraft/class_3366$class_3388;)V ARG 1 orientation ARG 2 setting - METHOD (Lnet/minecraft/class_3218;Lnet/minecraft/class_2487;)V - ARG 1 world - ARG 2 nbt CLASS class_3379 DoubleYRoom METHOD (Lnet/minecraft/class_2350;Lnet/minecraft/class_3366$class_3388;)V ARG 1 orientation ARG 2 setting - METHOD (Lnet/minecraft/class_3218;Lnet/minecraft/class_2487;)V - ARG 1 world - ARG 2 nbt CLASS class_3380 DoubleYZRoom METHOD (Lnet/minecraft/class_2350;Lnet/minecraft/class_3366$class_3388;)V ARG 1 orientation ARG 2 setting - METHOD (Lnet/minecraft/class_3218;Lnet/minecraft/class_2487;)V - ARG 1 world - ARG 2 nbt CLASS class_3381 DoubleZRoom METHOD (Lnet/minecraft/class_2350;Lnet/minecraft/class_3366$class_3388;)V ARG 1 orientation ARG 2 setting - METHOD (Lnet/minecraft/class_3218;Lnet/minecraft/class_2487;)V - ARG 1 world - ARG 2 nbt CLASS class_3382 Entry METHOD (Lnet/minecraft/class_2350;Lnet/minecraft/class_3366$class_3388;)V ARG 1 orientation ARG 2 setting - METHOD (Lnet/minecraft/class_3218;Lnet/minecraft/class_2487;)V - ARG 1 world - ARG 2 nbt CLASS class_3383 Penthouse METHOD (Lnet/minecraft/class_2350;Lnet/minecraft/class_3341;)V ARG 1 orientation ARG 2 box - METHOD (Lnet/minecraft/class_3218;Lnet/minecraft/class_2487;)V - ARG 1 world - ARG 2 nbt CLASS class_3384 Piece FIELD field_14468 TWO_TWO_ZERO_INDEX I FIELD field_14469 TWO_ZERO_ZERO_INDEX I @@ -177,23 +150,14 @@ CLASS net/minecraft/class_3366 net/minecraft/structure/OceanMonumentGenerator ARG 1 orientation ARG 2 setting ARG 3 random - METHOD (Lnet/minecraft/class_3218;Lnet/minecraft/class_2487;)V - ARG 1 world - ARG 2 nbt CLASS class_3386 SimpleRoomTop METHOD (Lnet/minecraft/class_2350;Lnet/minecraft/class_3366$class_3388;)V ARG 1 orientation ARG 2 setting - METHOD (Lnet/minecraft/class_3218;Lnet/minecraft/class_2487;)V - ARG 1 world - ARG 2 nbt CLASS class_3387 WingRoom METHOD (Lnet/minecraft/class_2350;Lnet/minecraft/class_3341;I)V ARG 1 orientation ARG 2 box - METHOD (Lnet/minecraft/class_3218;Lnet/minecraft/class_2487;)V - ARG 1 world - ARG 2 nbt CLASS class_3388 PieceSetting FIELD field_14482 neighborPresences [Z FIELD field_14485 used Z diff --git a/mappings/net/minecraft/structure/OceanRuinGenerator.mapping b/mappings/net/minecraft/structure/OceanRuinGenerator.mapping index d28fe7e985..fa23682256 100644 --- a/mappings/net/minecraft/structure/OceanRuinGenerator.mapping +++ b/mappings/net/minecraft/structure/OceanRuinGenerator.mapping @@ -38,8 +38,7 @@ CLASS net/minecraft/class_3409 net/minecraft/structure/OceanRuinGenerator FIELD field_14524 integrity F FIELD field_14525 large Z FIELD field_14527 biomeType Lnet/minecraft/class_3411$class_3413; - METHOD (Lnet/minecraft/class_3218;Lnet/minecraft/class_2487;)V - ARG 1 world + METHOD (Lnet/minecraft/class_3485;Lnet/minecraft/class_2487;)V 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 diff --git a/mappings/net/minecraft/structure/PoolStructurePiece.mapping b/mappings/net/minecraft/structure/PoolStructurePiece.mapping index 2bfe24bd92..c5ab472cb9 100644 --- a/mappings/net/minecraft/structure/PoolStructurePiece.mapping +++ b/mappings/net/minecraft/structure/PoolStructurePiece.mapping @@ -6,9 +6,6 @@ CLASS net/minecraft/class_3790 net/minecraft/structure/PoolStructurePiece FIELD field_16696 junctions Ljava/util/List; FIELD field_17660 structureManager Lnet/minecraft/class_3485; FIELD field_24991 LOGGER Lorg/apache/logging/log4j/Logger; - METHOD (Lnet/minecraft/class_3218;Lnet/minecraft/class_2487;)V - ARG 1 world - ARG 2 nbt 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 2 poolElement @@ -16,13 +13,15 @@ CLASS net/minecraft/class_3790 net/minecraft/structure/PoolStructurePiece ARG 4 groundLevelDelta ARG 5 rotation ARG 6 boundingBox + METHOD (Lnet/minecraft/class_6625;Lnet/minecraft/class_2487;)V + ARG 2 nbt METHOD method_16644 getPoolElement ()Lnet/minecraft/class_3784; METHOD method_16645 getJunctions ()Ljava/util/List; METHOD method_16646 getGroundLevelDelta ()I METHOD method_16647 addJunction (Lnet/minecraft/class_3780;)V ARG 1 junction METHOD method_16648 getPos ()Lnet/minecraft/class_2338; - METHOD method_27236 generate (Lnet/minecraft/class_5281;Lnet/minecraft/class_5138;Lnet/minecraft/class_2794;Ljava/util/Random;Lnet/minecraft/class_3341;Lnet/minecraft/class_2338;Z)Z + METHOD method_27236 generate (Lnet/minecraft/class_5281;Lnet/minecraft/class_5138;Lnet/minecraft/class_2794;Ljava/util/Random;Lnet/minecraft/class_3341;Lnet/minecraft/class_2338;Z)V ARG 1 world ARG 2 structureAccessor ARG 3 chunkGenerator diff --git a/mappings/net/minecraft/structure/RuinedPortalStructurePiece.mapping b/mappings/net/minecraft/structure/RuinedPortalStructurePiece.mapping index 3d1909485d..66113beee9 100644 --- a/mappings/net/minecraft/structure/RuinedPortalStructurePiece.mapping +++ b/mappings/net/minecraft/structure/RuinedPortalStructurePiece.mapping @@ -1,14 +1,13 @@ CLASS net/minecraft/class_5189 net/minecraft/structure/RuinedPortalStructurePiece FIELD field_24021 verticalPlacement Lnet/minecraft/class_5189$class_5191; FIELD field_24022 properties Lnet/minecraft/class_5189$class_5190; - METHOD (Lnet/minecraft/class_3218;Lnet/minecraft/class_2487;)V - ARG 1 world - ARG 2 nbt METHOD (Lnet/minecraft/class_3485;Lnet/minecraft/class_2338;Lnet/minecraft/class_5189$class_5191;Lnet/minecraft/class_5189$class_5190;Lnet/minecraft/class_2960;Lnet/minecraft/class_3499;Lnet/minecraft/class_2470;Lnet/minecraft/class_2415;Lnet/minecraft/class_2338;)V ARG 3 verticalPlacement ARG 4 properties ARG 7 rotation ARG 8 mirror + METHOD (Lnet/minecraft/class_3485;Lnet/minecraft/class_2487;)V + ARG 2 nbt METHOD method_27237 getBaseHeight (Lnet/minecraft/class_1936;IILnet/minecraft/class_5189$class_5191;)I ARG 0 world ARG 1 x @@ -51,8 +50,7 @@ CLASS net/minecraft/class_5189 net/minecraft/structure/RuinedPortalStructurePiec ARG 1 random ARG 2 world ARG 3 pos - METHOD method_35449 createPlacementData (Lnet/minecraft/class_3218;Lnet/minecraft/class_2487;Lnet/minecraft/class_2960;)Lnet/minecraft/class_3492; - ARG 0 world + METHOD method_35449 createPlacementData (Lnet/minecraft/class_3485;Lnet/minecraft/class_2487;Lnet/minecraft/class_2960;)Lnet/minecraft/class_3492; ARG 1 nbt ARG 2 id METHOD method_35450 createPlacementData (Lnet/minecraft/class_2415;Lnet/minecraft/class_2470;Lnet/minecraft/class_5189$class_5191;Lnet/minecraft/class_2338;Lnet/minecraft/class_5189$class_5190;)Lnet/minecraft/class_3492; diff --git a/mappings/net/minecraft/structure/ShipwreckGenerator.mapping b/mappings/net/minecraft/structure/ShipwreckGenerator.mapping index 2be8128d73..d18a7535e7 100644 --- a/mappings/net/minecraft/structure/ShipwreckGenerator.mapping +++ b/mappings/net/minecraft/structure/ShipwreckGenerator.mapping @@ -10,8 +10,7 @@ CLASS net/minecraft/class_3415 net/minecraft/structure/ShipwreckGenerator ARG 5 config CLASS class_3416 Piece FIELD field_14538 grounded Z - METHOD (Lnet/minecraft/class_3218;Lnet/minecraft/class_2487;)V - ARG 1 world + METHOD (Lnet/minecraft/class_3485;Lnet/minecraft/class_2487;)V ARG 2 nbt METHOD (Lnet/minecraft/class_3485;Lnet/minecraft/class_2960;Lnet/minecraft/class_2338;Lnet/minecraft/class_2470;Z)V ARG 1 manager diff --git a/mappings/net/minecraft/structure/SimpleStructurePiece.mapping b/mappings/net/minecraft/structure/SimpleStructurePiece.mapping index 1bb837e89e..35c6010a7f 100644 --- a/mappings/net/minecraft/structure/SimpleStructurePiece.mapping +++ b/mappings/net/minecraft/structure/SimpleStructurePiece.mapping @@ -10,9 +10,8 @@ CLASS net/minecraft/class_3470 net/minecraft/structure/SimpleStructurePiece ARG 4 identifier ARG 6 placementData ARG 7 pos - METHOD (Lnet/minecraft/class_3773;Lnet/minecraft/class_2487;Lnet/minecraft/class_3218;Ljava/util/function/Function;)V + METHOD (Lnet/minecraft/class_3773;Lnet/minecraft/class_2487;Lnet/minecraft/class_3485;Ljava/util/function/Function;)V ARG 1 type - ARG 3 world METHOD method_15026 handleMetadata (Ljava/lang/String;Lnet/minecraft/class_2338;Lnet/minecraft/class_5425;Ljava/util/Random;Lnet/minecraft/class_3341;)V ARG 1 metadata ARG 2 pos diff --git a/mappings/net/minecraft/structure/StrongholdGenerator.mapping b/mappings/net/minecraft/structure/StrongholdGenerator.mapping index 96f6cfe8a6..5d682044f7 100644 --- a/mappings/net/minecraft/structure/StrongholdGenerator.mapping +++ b/mappings/net/minecraft/structure/StrongholdGenerator.mapping @@ -40,9 +40,6 @@ CLASS net/minecraft/class_3421 net/minecraft/structure/StrongholdGenerator ARG 2 random ARG 3 boundingBox ARG 4 orientation - METHOD (Lnet/minecraft/class_3218;Lnet/minecraft/class_2487;)V - ARG 1 world - ARG 2 nbt METHOD method_14856 create (Lnet/minecraft/class_6130;Ljava/util/Random;IIILnet/minecraft/class_2350;I)Lnet/minecraft/class_3421$class_3422; ARG 1 random ARG 2 x @@ -56,8 +53,6 @@ CLASS net/minecraft/class_3421 net/minecraft/structure/StrongholdGenerator ARG 1 chainLength ARG 2 boundingBox ARG 3 orientation - METHOD (Lnet/minecraft/class_3218;Lnet/minecraft/class_2487;)V - ARG 2 nbt METHOD method_14857 create (Lnet/minecraft/class_6130;Ljava/util/Random;IIILnet/minecraft/class_2350;)Lnet/minecraft/class_3341; ARG 1 random ARG 2 x @@ -77,9 +72,6 @@ CLASS net/minecraft/class_3421 net/minecraft/structure/StrongholdGenerator ARG 2 random ARG 3 boundingBox ARG 4 orientation - METHOD (Lnet/minecraft/class_3218;Lnet/minecraft/class_2487;)V - ARG 1 world - ARG 2 nbt METHOD method_14858 create (Lnet/minecraft/class_6130;Ljava/util/Random;IIILnet/minecraft/class_2350;I)Lnet/minecraft/class_3421$class_3424; ARG 1 random ARG 2 x @@ -93,9 +85,6 @@ CLASS net/minecraft/class_3421 net/minecraft/structure/StrongholdGenerator ARG 2 random ARG 3 boundingBox ARG 4 orientation - METHOD (Lnet/minecraft/class_3218;Lnet/minecraft/class_2487;)V - ARG 1 world - ARG 2 nbt METHOD method_14859 create (Lnet/minecraft/class_6130;Ljava/util/Random;IIILnet/minecraft/class_2350;I)Lnet/minecraft/class_3421$class_3425; ARG 1 random ARG 2 x @@ -113,9 +102,6 @@ CLASS net/minecraft/class_3421 net/minecraft/structure/StrongholdGenerator ARG 2 random ARG 3 boundingBox ARG 4 orientation - METHOD (Lnet/minecraft/class_3218;Lnet/minecraft/class_2487;)V - ARG 1 world - ARG 2 nbt METHOD method_14860 create (Lnet/minecraft/class_6130;Ljava/util/Random;IIILnet/minecraft/class_2350;I)Lnet/minecraft/class_3421$class_3426; ARG 1 random ARG 2 x @@ -144,9 +130,6 @@ CLASS net/minecraft/class_3421 net/minecraft/structure/StrongholdGenerator ARG 1 chainLength ARG 2 boundingBox ARG 3 orientation - METHOD (Lnet/minecraft/class_3218;Lnet/minecraft/class_2487;)V - ARG 1 world - ARG 2 nbt METHOD method_14863 create (Lnet/minecraft/class_6130;IIILnet/minecraft/class_2350;I)Lnet/minecraft/class_3421$class_3428; ARG 1 x ARG 2 y @@ -162,9 +145,6 @@ CLASS net/minecraft/class_3421 net/minecraft/structure/StrongholdGenerator ARG 2 random ARG 3 boundingBox ARG 4 orientation - METHOD (Lnet/minecraft/class_3218;Lnet/minecraft/class_2487;)V - ARG 1 world - ARG 2 nbt METHOD method_14864 create (Lnet/minecraft/class_6130;Ljava/util/Random;IIILnet/minecraft/class_2350;I)Lnet/minecraft/class_3421$class_3429; ARG 1 random ARG 2 x @@ -178,9 +158,6 @@ CLASS net/minecraft/class_3421 net/minecraft/structure/StrongholdGenerator ARG 2 random ARG 3 boundingBox ARG 4 orientation - METHOD (Lnet/minecraft/class_3218;Lnet/minecraft/class_2487;)V - ARG 1 world - ARG 2 nbt METHOD method_16652 create (Lnet/minecraft/class_6130;Ljava/util/Random;IIILnet/minecraft/class_2350;I)Lnet/minecraft/class_3421$class_3430; ARG 1 random ARG 2 x @@ -198,9 +175,6 @@ CLASS net/minecraft/class_3421 net/minecraft/structure/StrongholdGenerator ARG 2 random ARG 3 boundingBox ARG 4 orientation - METHOD (Lnet/minecraft/class_3218;Lnet/minecraft/class_2487;)V - ARG 1 world - ARG 2 nbt METHOD method_14865 create (Lnet/minecraft/class_6130;Ljava/util/Random;IIILnet/minecraft/class_2350;I)Lnet/minecraft/class_3421$class_3431; ARG 1 random ARG 2 x @@ -219,9 +193,6 @@ CLASS net/minecraft/class_3421 net/minecraft/structure/StrongholdGenerator ARG 2 random ARG 3 boundingBox ARG 4 orientation - METHOD (Lnet/minecraft/class_3218;Lnet/minecraft/class_2487;)V - ARG 1 world - ARG 2 nbt METHOD (Lnet/minecraft/class_3773;IIILnet/minecraft/class_2350;)V ARG 1 structurePieceType ARG 2 chainLength @@ -252,9 +223,6 @@ CLASS net/minecraft/class_3421 net/minecraft/structure/StrongholdGenerator ARG 2 random ARG 3 boundingBox ARG 4 orientation - METHOD (Lnet/minecraft/class_3218;Lnet/minecraft/class_2487;)V - ARG 1 world - ARG 2 nbt METHOD method_14867 create (Lnet/minecraft/class_6130;Ljava/util/Random;IIILnet/minecraft/class_2350;I)Lnet/minecraft/class_3421$class_3435; ARG 1 random ARG 2 x @@ -271,9 +239,6 @@ CLASS net/minecraft/class_3421 net/minecraft/structure/StrongholdGenerator ARG 2 random ARG 3 boundingBox ARG 4 orientation - METHOD (Lnet/minecraft/class_3218;Lnet/minecraft/class_2487;)V - ARG 1 world - ARG 2 nbt METHOD method_14868 create (Lnet/minecraft/class_6130;Ljava/util/Random;IIILnet/minecraft/class_2350;I)Lnet/minecraft/class_3421$class_3436; ARG 1 random ARG 2 x diff --git a/mappings/net/minecraft/structure/StructurePiece.mapping b/mappings/net/minecraft/structure/StructurePiece.mapping index b566281f0d..f9241be2d0 100644 --- a/mappings/net/minecraft/structure/StructurePiece.mapping +++ b/mappings/net/minecraft/structure/StructurePiece.mapping @@ -82,7 +82,7 @@ CLASS net/minecraft/class_3443 net/minecraft/structure/StructurePiece ARG 6 z ARG 7 facing ARG 8 lootTableId - METHOD method_14931 generate (Lnet/minecraft/class_5281;Lnet/minecraft/class_5138;Lnet/minecraft/class_2794;Ljava/util/Random;Lnet/minecraft/class_3341;Lnet/minecraft/class_1923;Lnet/minecraft/class_2338;)Z + METHOD method_14931 generate (Lnet/minecraft/class_5281;Lnet/minecraft/class_5138;Lnet/minecraft/class_2794;Ljava/util/Random;Lnet/minecraft/class_3341;Lnet/minecraft/class_1923;Lnet/minecraft/class_2338;)V ARG 1 world ARG 2 structureAccessor ARG 3 chunkGenerator @@ -156,8 +156,7 @@ CLASS net/minecraft/class_3443 net/minecraft/structure/StructurePiece ARG 6 maxX ARG 7 maxY ARG 8 maxZ - METHOD method_14943 writeNbt (Lnet/minecraft/class_3218;Lnet/minecraft/class_2487;)V - ARG 1 world + METHOD method_14943 writeNbt (Lnet/minecraft/class_6625;Lnet/minecraft/class_2487;)V ARG 2 nbt METHOD method_14945 addBlockWithRandomThreshold (Lnet/minecraft/class_5281;Lnet/minecraft/class_3341;Ljava/util/Random;FIIILnet/minecraft/class_2680;)V ARG 1 world @@ -168,8 +167,7 @@ CLASS net/minecraft/class_3443 net/minecraft/structure/StructurePiece ARG 6 y ARG 7 z ARG 8 state - METHOD method_14946 toNbt (Lnet/minecraft/class_3218;)Lnet/minecraft/class_2487; - ARG 1 world + METHOD method_14946 toNbt (Lnet/minecraft/class_6625;)Lnet/minecraft/class_2487; METHOD method_16653 getType ()Lnet/minecraft/class_3773; METHOD method_16654 intersectsChunk (Lnet/minecraft/class_1923;I)Z ARG 1 pos diff --git a/mappings/net/minecraft/structure/StructurePieceType.mapping b/mappings/net/minecraft/structure/StructurePieceType.mapping index 9792873201..ae052d0a7d 100644 --- a/mappings/net/minecraft/structure/StructurePieceType.mapping +++ b/mappings/net/minecraft/structure/StructurePieceType.mapping @@ -54,9 +54,7 @@ CLASS net/minecraft/class_3773 net/minecraft/structure/StructurePieceType FIELD field_16970 OCEAN_MONUMENT_DOUBLE_Y_Z_ROOM Lnet/minecraft/class_3773; FIELD field_22195 NETHER_FOSSIL Lnet/minecraft/class_3773; FIELD field_24010 RUINED_PORTAL Lnet/minecraft/class_3773; - METHOD load (Lnet/minecraft/class_3218;Lnet/minecraft/class_2487;)Lnet/minecraft/class_3443; - ARG 1 world + METHOD load (Lnet/minecraft/class_6625;Lnet/minecraft/class_2487;)Lnet/minecraft/class_3443; ARG 2 nbt - METHOD method_16813 register (Lnet/minecraft/class_3773;Ljava/lang/String;)Lnet/minecraft/class_3773; - ARG 0 pieceType + METHOD method_16813 register (Lnet/minecraft/class_3773$class_6615;Ljava/lang/String;)Lnet/minecraft/class_3773; ARG 1 id diff --git a/mappings/net/minecraft/structure/StructureStart.mapping b/mappings/net/minecraft/structure/StructureStart.mapping index 8d2a7983fc..c44bb707f8 100644 --- a/mappings/net/minecraft/structure/StructureStart.mapping +++ b/mappings/net/minecraft/structure/StructureStart.mapping @@ -2,7 +2,6 @@ CLASS net/minecraft/class_3449 net/minecraft/structure/StructureStart COMMENT A structure start is created to describe a structure that will be generated by COMMENT chunk generation. It contains a definition of its pieces and is associated COMMENT with the chunk that the structure originates from. - FIELD field_15325 children Ljava/util/List; FIELD field_15326 references I COMMENT The number of chunks that intersect the structures bounding box, COMMENT and have stored references to its starting chunk. @@ -13,54 +12,26 @@ CLASS net/minecraft/class_3449 net/minecraft/structure/StructureStart COMMENT phase). FIELD field_16713 DEFAULT Lnet/minecraft/class_3449; FIELD field_16714 feature Lnet/minecraft/class_3195; - FIELD field_16715 random Lnet/minecraft/class_2919; FIELD field_29070 pos Lnet/minecraft/class_1923; - FIELD field_29328 LOGGER Lorg/apache/logging/log4j/Logger; FIELD field_31662 INVALID Ljava/lang/String; FIELD field_31663 boundingBox Lnet/minecraft/class_3341; - METHOD (Lnet/minecraft/class_3195;Lnet/minecraft/class_1923;IJ)V + METHOD (Lnet/minecraft/class_3195;Lnet/minecraft/class_1923;ILnet/minecraft/class_6624;)V ARG 1 feature ARG 2 pos ARG 3 references - ARG 4 seed - METHOD method_14962 getBlockPos ()Lnet/minecraft/class_2338; METHOD method_14963 getChildren ()Ljava/util/List; METHOD method_14964 incrementReferences ()V METHOD method_14969 setBoundingBoxFromChildren ()Lnet/minecraft/class_3341; METHOD method_14970 getReferenceCountToBeInExistingChunk ()I - METHOD method_14972 toNbt (Lnet/minecraft/class_3218;Lnet/minecraft/class_1923;)Lnet/minecraft/class_2487; - ARG 1 world + METHOD method_14972 toNbt (Lnet/minecraft/class_6625;Lnet/minecraft/class_1923;)Lnet/minecraft/class_2487; ARG 2 chunkPos - METHOD method_14974 generateStructure (Lnet/minecraft/class_5281;Lnet/minecraft/class_5138;Lnet/minecraft/class_2794;Ljava/util/Random;Ljava/util/function/Predicate;Lnet/minecraft/class_3341;Lnet/minecraft/class_1923;)V + METHOD method_14974 generateStructure (Lnet/minecraft/class_5281;Lnet/minecraft/class_5138;Lnet/minecraft/class_2794;Ljava/util/Random;Lnet/minecraft/class_3341;Lnet/minecraft/class_1923;)V ARG 1 world ARG 2 structureAccessor ARG 3 chunkGenerator ARG 4 random - METHOD method_14976 randomUpwardTranslation (Ljava/util/Random;II)V - ARG 1 random - ARG 2 minY - ARG 3 maxY - METHOD method_14978 randomUpwardTranslation (IILjava/util/Random;I)V - ARG 1 seaLevel - ARG 3 random METHOD method_14979 isInExistingChunk ()Z - METHOD method_16655 init (Lnet/minecraft/class_5455;Lnet/minecraft/class_2794;Lnet/minecraft/class_3485;Lnet/minecraft/class_1923;Lnet/minecraft/class_3037;Lnet/minecraft/class_5539;Ljava/util/function/Predicate;)V - ARG 1 registryManager - ARG 2 chunkGenerator - ARG 3 manager - ARG 4 pos METHOD method_16656 getFeature ()Lnet/minecraft/class_3195; METHOD method_16657 hasChildren ()Z METHOD method_23676 getReferences ()I METHOD method_34000 getPos ()Lnet/minecraft/class_1923; - METHOD method_35463 translateUpward (I)V - ARG 1 amount - METHOD method_35464 contains (Lnet/minecraft/class_2338;)Z - ARG 1 pos - METHOD method_35465 getIntersecting (Ljava/util/List;Lnet/minecraft/class_3341;)Lnet/minecraft/class_3443; - ARG 0 pieces - ARG 1 box - METHOD method_35466 clearChildren ()V - METHOD method_35467 hasNoChildren ()Z - METHOD method_35468 resetBoundingBox ()V - METHOD method_36217 calculateBoundingBox ()Lnet/minecraft/class_3341; diff --git a/mappings/net/minecraft/structure/SwampHutGenerator.mapping b/mappings/net/minecraft/structure/SwampHutGenerator.mapping index 441aab4f77..ceb21b8376 100644 --- a/mappings/net/minecraft/structure/SwampHutGenerator.mapping +++ b/mappings/net/minecraft/structure/SwampHutGenerator.mapping @@ -5,9 +5,6 @@ CLASS net/minecraft/class_3447 net/minecraft/structure/SwampHutGenerator ARG 1 random ARG 2 x ARG 3 z - METHOD (Lnet/minecraft/class_3218;Lnet/minecraft/class_2487;)V - ARG 1 world - ARG 2 nbt METHOD method_16181 spawnCat (Lnet/minecraft/class_5425;Lnet/minecraft/class_3341;)V ARG 1 world ARG 2 box diff --git a/mappings/net/minecraft/structure/WoodlandMansionGenerator.mapping b/mappings/net/minecraft/structure/WoodlandMansionGenerator.mapping index c6f2e8f60c..7e88aa9589 100644 --- a/mappings/net/minecraft/structure/WoodlandMansionGenerator.mapping +++ b/mappings/net/minecraft/structure/WoodlandMansionGenerator.mapping @@ -94,9 +94,6 @@ CLASS net/minecraft/class_3471 net/minecraft/structure/WoodlandMansionGenerator ARG 3 value CLASS class_3479 ThirdFloorRoomPool CLASS class_3480 Piece - METHOD (Lnet/minecraft/class_3218;Lnet/minecraft/class_2487;)V - ARG 1 world - ARG 2 nbt METHOD (Lnet/minecraft/class_3485;Ljava/lang/String;Lnet/minecraft/class_2338;Lnet/minecraft/class_2470;)V ARG 1 structureManager ARG 2 template @@ -108,6 +105,8 @@ CLASS net/minecraft/class_3471 net/minecraft/structure/WoodlandMansionGenerator ARG 3 pos ARG 4 rotation ARG 5 mirror + METHOD (Lnet/minecraft/class_3485;Lnet/minecraft/class_2487;)V + ARG 2 nbt METHOD method_35473 createPlacementData (Lnet/minecraft/class_2415;Lnet/minecraft/class_2470;)Lnet/minecraft/class_3492; ARG 0 mirror ARG 1 rotation diff --git a/mappings/net/minecraft/unused/packageinfo/PackageInfo6511.mapping b/mappings/net/minecraft/unused/packageinfo/PackageInfo6511.mapping deleted file mode 100644 index 1f8b3e06c4..0000000000 --- a/mappings/net/minecraft/unused/packageinfo/PackageInfo6511.mapping +++ /dev/null @@ -1 +0,0 @@ -CLASS net/minecraft/class_6511 net/minecraft/unused/packageinfo/PackageInfo6511 diff --git a/mappings/net/minecraft/unused/packageinfo/PackageInfo6513.mapping b/mappings/net/minecraft/unused/packageinfo/PackageInfo6513.mapping deleted file mode 100644 index da0e2e5f45..0000000000 --- a/mappings/net/minecraft/unused/packageinfo/PackageInfo6513.mapping +++ /dev/null @@ -1 +0,0 @@ -CLASS net/minecraft/class_6513 net/minecraft/unused/packageinfo/PackageInfo6513 diff --git a/mappings/net/minecraft/unused/packageinfo/PackageInfo6514.mapping b/mappings/net/minecraft/unused/packageinfo/PackageInfo6514.mapping deleted file mode 100644 index f9ed0ae347..0000000000 --- a/mappings/net/minecraft/unused/packageinfo/PackageInfo6514.mapping +++ /dev/null @@ -1 +0,0 @@ -CLASS net/minecraft/class_6514 net/minecraft/unused/packageinfo/PackageInfo6514 diff --git a/mappings/net/minecraft/unused/packageinfo/PackageInfo6614.mapping b/mappings/net/minecraft/unused/packageinfo/PackageInfo6614.mapping new file mode 100644 index 0000000000..7ef498f4f0 --- /dev/null +++ b/mappings/net/minecraft/unused/packageinfo/PackageInfo6614.mapping @@ -0,0 +1 @@ +CLASS net/minecraft/class_6614 net/minecraft/unused/packageinfo/PackageInfo6614 diff --git a/mappings/net/minecraft/unused/packageinfo/PackageInfo6627.mapping b/mappings/net/minecraft/unused/packageinfo/PackageInfo6627.mapping new file mode 100644 index 0000000000..d463ad5160 --- /dev/null +++ b/mappings/net/minecraft/unused/packageinfo/PackageInfo6627.mapping @@ -0,0 +1 @@ +CLASS net/minecraft/class_6627 net/minecraft/unused/packageinfo/PackageInfo6627 diff --git a/mappings/net/minecraft/unused/packageinfo/PackageInfo6633.mapping b/mappings/net/minecraft/unused/packageinfo/PackageInfo6633.mapping new file mode 100644 index 0000000000..fe9ac39525 --- /dev/null +++ b/mappings/net/minecraft/unused/packageinfo/PackageInfo6633.mapping @@ -0,0 +1 @@ +CLASS net/minecraft/class_6633 net/minecraft/unused/packageinfo/PackageInfo6633 diff --git a/mappings/net/minecraft/util/Util.mapping b/mappings/net/minecraft/util/Util.mapping index edb25ee955..964ba3cadb 100644 --- a/mappings/net/minecraft/util/Util.mapping +++ b/mappings/net/minecraft/util/Util.mapping @@ -117,7 +117,7 @@ CLASS net/minecraft/class_156 net/minecraft/util/Util ARG 1 length METHOD method_33559 error (Ljava/lang/String;)V ARG 0 message - METHOD method_33560 pause ()V + METHOD method_33560 pause (Ljava/lang/String;)V METHOD method_33787 debugRunnable (Ljava/lang/String;Ljava/lang/Runnable;)Ljava/lang/Runnable; ARG 0 activeThreadName ARG 1 task diff --git a/mappings/net/minecraft/util/profiling/jfr/JfrProfiler.mapping b/mappings/net/minecraft/util/profiling/jfr/JfrProfiler.mapping index bce6a4f558..a1e35d0149 100644 --- a/mappings/net/minecraft/util/profiling/jfr/JfrProfiler.mapping +++ b/mappings/net/minecraft/util/profiling/jfr/JfrProfiler.mapping @@ -8,15 +8,9 @@ CLASS net/minecraft/class_6505 net/minecraft/util/profiling/jfr/JfrProfiler FIELD field_34409 CONFIG_PATH Ljava/lang/String; FIELD field_34410 DATE_TIME_FORMAT Ljava/time/format/DateTimeFormatter; FIELD field_34411 currentRecording Ljdk/jfr/Recording; - METHOD method_37980 stop ()Ljava/nio/file/Path; - METHOD method_37981 start (Lnet/minecraft/class_6505$class_6506;)Z - ARG 0 instanceType METHOD method_37982 (Lnet/minecraft/class_6505$class_6506;Ljava/lang/String;Ljdk/jfr/Recording;)V ARG 2 recording METHOD method_37983 start (Ljava/io/Reader;Lnet/minecraft/class_6505$class_6506;)Z - ARG 0 reader - ARG 1 instanceType - METHOD method_37984 isProfiling ()Z CLASS class_6506 InstanceType FIELD field_34414 name Ljava/lang/String; METHOD (Ljava/lang/String;ILjava/lang/String;)V @@ -25,16 +19,10 @@ CLASS net/minecraft/class_6505 net/minecraft/util/profiling/jfr/JfrProfiler METHOD method_37987 get (Lnet/minecraft/server/MinecraftServer;)Lnet/minecraft/class_6505$class_6506; ARG 0 server CLASS class_6507 Listener - FIELD field_34416 recording Ljdk/jfr/Recording; FIELD field_34417 stopCallback Ljava/lang/Runnable; - METHOD (Ljdk/jfr/Recording;Ljava/lang/Runnable;)V - ARG 1 recording - ARG 2 stopCallback METHOD method_37989 shouldUseLogger ()Z METHOD method_37991 log (Lorg/apache/logging/log4j/util/Supplier;)V ARG 0 messageSupplier METHOD method_37992 warn (Lorg/apache/logging/log4j/util/Supplier;Ljava/lang/Throwable;)V ARG 0 messageSupplier ARG 1 throwable - METHOD recordingStateChanged (Ljdk/jfr/Recording;)V - ARG 1 recording diff --git a/mappings/net/minecraft/util/profiling/jfr/event/worldgen/ChunkGenerationEvent.mapping b/mappings/net/minecraft/util/profiling/jfr/event/ChunkGenerationEvent.mapping similarity index 54% rename from mappings/net/minecraft/util/profiling/jfr/event/worldgen/ChunkGenerationEvent.mapping rename to mappings/net/minecraft/util/profiling/jfr/event/ChunkGenerationEvent.mapping index dbf8b1ea31..aee036eee9 100644 --- a/mappings/net/minecraft/util/profiling/jfr/event/worldgen/ChunkGenerationEvent.mapping +++ b/mappings/net/minecraft/util/profiling/jfr/event/ChunkGenerationEvent.mapping @@ -1,13 +1,8 @@ -CLASS net/minecraft/util/profiling/jfr/event/worldgen/ChunkGenerationEvent - METHOD (Lnet/minecraft/class_1923;Lnet/minecraft/class_5321;Ljava/lang/String;)V - ARG 1 chunkPos - ARG 2 world - ARG 3 targetStatus +CLASS net/minecraft/util/profiling/jfr/event/ChunkGenerationEvent CLASS class_6602 Names FIELD field_34855 WORLD_POS_X Ljava/lang/String; FIELD field_34856 WORLD_POS_Z Ljava/lang/String; FIELD field_34857 CHUNK_POS_X Ljava/lang/String; FIELD field_34858 CHUNK_POS_Z Ljava/lang/String; FIELD field_34859 STATUS Ljava/lang/String; - FIELD field_34860 SUCCESS Ljava/lang/String; FIELD field_34861 LEVEL Ljava/lang/String; diff --git a/mappings/net/minecraft/util/profiling/jfr/event/ServerTickTimeEvent.mapping b/mappings/net/minecraft/util/profiling/jfr/event/ServerTickTimeEvent.mapping new file mode 100644 index 0000000000..4af0470106 --- /dev/null +++ b/mappings/net/minecraft/util/profiling/jfr/event/ServerTickTimeEvent.mapping @@ -0,0 +1,3 @@ +CLASS net/minecraft/util/profiling/jfr/event/ServerTickTimeEvent + CLASS class_6601 Names + FIELD field_34854 AVERAGE_TICK_MS Ljava/lang/String; diff --git a/mappings/net/minecraft/util/profiling/jfr/event/ticking/ServerTickTimeEvent.mapping b/mappings/net/minecraft/util/profiling/jfr/event/ticking/ServerTickTimeEvent.mapping deleted file mode 100644 index 01083a6b0b..0000000000 --- a/mappings/net/minecraft/util/profiling/jfr/event/ticking/ServerTickTimeEvent.mapping +++ /dev/null @@ -1,5 +0,0 @@ -CLASS net/minecraft/util/profiling/jfr/event/ticking/ServerTickTimeEvent - METHOD (F)V - ARG 1 averageTickMs - CLASS class_6601 Names - FIELD field_34854 AVERAGE_TICK_MS Ljava/lang/String; diff --git a/mappings/net/minecraft/util/profiling/jfr/sample/ChunkGenerationSample.mapping b/mappings/net/minecraft/util/profiling/jfr/sample/ChunkGenerationSample.mapping index 7002a0cf82..86f85eb909 100644 --- a/mappings/net/minecraft/util/profiling/jfr/sample/ChunkGenerationSample.mapping +++ b/mappings/net/minecraft/util/profiling/jfr/sample/ChunkGenerationSample.mapping @@ -3,14 +3,12 @@ CLASS net/minecraft/class_6521 net/minecraft/util/profiling/jfr/sample/ChunkGene FIELD comp_17 chunkPos Lnet/minecraft/class_1923; FIELD comp_18 centerPos Lnet/minecraft/class_2265; FIELD comp_19 chunkStatus Lnet/minecraft/class_2806; - FIELD comp_20 successful Z FIELD comp_21 worldKey Ljava/lang/String; - METHOD (Ljava/time/Duration;Lnet/minecraft/class_1923;Lnet/minecraft/class_2265;Lnet/minecraft/class_2806;ZLjava/lang/String;)V + METHOD (Ljava/time/Duration;Lnet/minecraft/class_1923;Lnet/minecraft/class_2265;Lnet/minecraft/class_2806;Ljava/lang/String;)V ARG 1 duration METHOD comp_17 chunkPos ()Lnet/minecraft/class_1923; METHOD comp_18 centerPos ()Lnet/minecraft/class_2265; METHOD comp_19 chunkStatus ()Lnet/minecraft/class_2806; - METHOD comp_20 successful ()Z METHOD comp_21 worldKey ()Ljava/lang/String; METHOD equals (Ljava/lang/Object;)Z ARG 1 o diff --git a/mappings/net/minecraft/util/profiling/jfr/sample/ServerTickTimeSample.mapping b/mappings/net/minecraft/util/profiling/jfr/sample/ServerTickTimeSample.mapping index bbf0c0a4c4..615a14eecb 100644 --- a/mappings/net/minecraft/util/profiling/jfr/sample/ServerTickTimeSample.mapping +++ b/mappings/net/minecraft/util/profiling/jfr/sample/ServerTickTimeSample.mapping @@ -1,8 +1,8 @@ CLASS net/minecraft/class_6532 net/minecraft/util/profiling/jfr/sample/ServerTickTimeSample FIELD comp_52 time Ljava/time/Instant; - FIELD comp_53 averageTickMs F + FIELD comp_53 averageTickMs Ljava/time/Duration; METHOD comp_52 time ()Ljava/time/Instant; - METHOD comp_53 averageTickMs ()F + METHOD comp_53 averageTickMs ()Ljava/time/Duration; METHOD equals (Ljava/lang/Object;)Z ARG 1 o METHOD method_38058 fromEvent (Ljdk/jfr/consumer/RecordedEvent;)Lnet/minecraft/class_6532; diff --git a/mappings/net/minecraft/world/ChunkSerializer.mapping b/mappings/net/minecraft/world/ChunkSerializer.mapping index 093916e12c..751ac1bd9e 100644 --- a/mappings/net/minecraft/world/ChunkSerializer.mapping +++ b/mappings/net/minecraft/world/ChunkSerializer.mapping @@ -3,8 +3,7 @@ CLASS net/minecraft/class_2852 net/minecraft/world/ChunkSerializer FIELD field_31413 UPGRADE_DATA_KEY Ljava/lang/String; METHOD method_12377 getChunkType (Lnet/minecraft/class_2487;)Lnet/minecraft/class_2806$class_2808; ARG 0 nbt - METHOD method_12385 writeStructures (Lnet/minecraft/class_3218;Lnet/minecraft/class_1923;Ljava/util/Map;Ljava/util/Map;)Lnet/minecraft/class_2487; - ARG 0 world + METHOD method_12385 writeStructures (Lnet/minecraft/class_6625;Lnet/minecraft/class_1923;Ljava/util/Map;Ljava/util/Map;)Lnet/minecraft/class_2487; ARG 1 pos ARG 2 starts ARG 3 references @@ -17,8 +16,7 @@ CLASS net/minecraft/class_2852 net/minecraft/world/ChunkSerializer ARG 1 nbt METHOD method_12391 (Lnet/minecraft/class_3611;)Z ARG 0 fluid - METHOD method_12392 readStructureStarts (Lnet/minecraft/class_3218;Lnet/minecraft/class_2487;J)Ljava/util/Map; - ARG 0 world + METHOD method_12392 readStructureStarts (Lnet/minecraft/class_6625;Lnet/minecraft/class_2487;J)Ljava/util/Map; ARG 1 nbt ARG 2 worldSeed METHOD method_12393 toNbt ([Lit/unimi/dsi/fastutil/shorts/ShortList;)Lnet/minecraft/class_2499; diff --git a/mappings/net/minecraft/world/biome/source/util/MultiNoiseUtil.mapping b/mappings/net/minecraft/world/biome/source/util/MultiNoiseUtil.mapping index bc263df6c5..d8caa3405b 100644 --- a/mappings/net/minecraft/world/biome/source/util/MultiNoiseUtil.mapping +++ b/mappings/net/minecraft/world/biome/source/util/MultiNoiseUtil.mapping @@ -27,30 +27,36 @@ CLASS net/minecraft/class_6544 net/minecraft/world/biome/source/util/MultiNoiseU COMMENT Represents a hypercube in a multi-dimensional cartesian plane. The multi-noise COMMENT biome source picks the closest noise hypercube from its selected point COMMENT and chooses the biome associated to it. - FIELD field_22043 temperature Lnet/minecraft/class_6544$class_6546; - FIELD field_22044 humidity Lnet/minecraft/class_6544$class_6546; - FIELD field_22046 weirdness Lnet/minecraft/class_6544$class_6546; - FIELD field_22047 offset F + FIELD comp_105 temperature Lnet/minecraft/class_6544$class_6546; + FIELD comp_106 humidity Lnet/minecraft/class_6544$class_6546; + FIELD comp_107 continentalness Lnet/minecraft/class_6544$class_6546; + FIELD comp_108 erosion Lnet/minecraft/class_6544$class_6546; + FIELD comp_109 depth Lnet/minecraft/class_6544$class_6546; + FIELD comp_110 weirdness Lnet/minecraft/class_6544$class_6546; + FIELD comp_111 offset J COMMENT This value works differently from the other parameters, in that it is COMMENT always {@code 0} during biome generation and does not use noise. COMMENT This means that setting it to a non-null number will make the biome smaller. COMMENT The farther {@code offset} is from {@code 0}, the smaller the biome will be. COMMENT For this, it does not matter whether {@code offset} is positive or negative. FIELD field_24679 CODEC Lcom/mojang/serialization/Codec; - FIELD field_34483 continentalness Lnet/minecraft/class_6544$class_6546; - FIELD field_34484 erosion Lnet/minecraft/class_6544$class_6546; - FIELD field_34485 depth Lnet/minecraft/class_6544$class_6546; - METHOD (Lnet/minecraft/class_6544$class_6546;Lnet/minecraft/class_6544$class_6546;Lnet/minecraft/class_6544$class_6546;Lnet/minecraft/class_6544$class_6546;Lnet/minecraft/class_6544$class_6546;Lnet/minecraft/class_6544$class_6546;F)V + METHOD (Lnet/minecraft/class_6544$class_6546;Lnet/minecraft/class_6544$class_6546;Lnet/minecraft/class_6544$class_6546;Lnet/minecraft/class_6544$class_6546;Lnet/minecraft/class_6544$class_6546;Lnet/minecraft/class_6544$class_6546;J)V ARG 1 temperature ARG 2 humidity ARG 3 continentalness ARG 4 erosion ARG 5 depth ARG 6 weirdness - ARG 7 offset + METHOD comp_105 temperature ()Lnet/minecraft/class_6544$class_6546; + METHOD comp_106 humidity ()Lnet/minecraft/class_6544$class_6546; + METHOD comp_107 continentalness ()Lnet/minecraft/class_6544$class_6546; + METHOD comp_108 erosion ()Lnet/minecraft/class_6544$class_6546; + METHOD comp_109 depth ()Lnet/minecraft/class_6544$class_6546; + METHOD comp_110 weirdness ()Lnet/minecraft/class_6544$class_6546; + METHOD comp_111 offset ()J METHOD equals (Ljava/lang/Object;)Z ARG 1 o - METHOD method_24381 getSquaredDistance (Lnet/minecraft/class_6544$class_6553;)F + METHOD method_24381 getSquaredDistance (Lnet/minecraft/class_6544$class_6553;)J COMMENT Calculates the distance from this noise point to another one. The COMMENT distance is a squared distance in a multi-dimensional cartesian plane COMMENT from a mathematical point of view, with a special parameter that @@ -66,33 +72,21 @@ CLASS net/minecraft/class_6544 net/minecraft/world/biome/source/util/MultiNoiseU ARG 1 point METHOD method_28425 (Lcom/mojang/serialization/codecs/RecordCodecBuilder$Instance;)Lcom/mojang/datafixers/kinds/App; ARG 0 instance - METHOD method_38133 getTemperature ()Lnet/minecraft/class_6544$class_6546; - METHOD method_38135 getHumidity ()Lnet/minecraft/class_6544$class_6546; - METHOD method_38137 getContinentalness ()Lnet/minecraft/class_6544$class_6546; - METHOD method_38139 getErosion ()Lnet/minecraft/class_6544$class_6546; - METHOD method_38141 getDepth ()Lnet/minecraft/class_6544$class_6546; - METHOD method_38143 getWeirdness ()Lnet/minecraft/class_6544$class_6546; - METHOD method_38144 getOffset ()F METHOD method_38145 getParameters ()Ljava/util/List; CLASS class_6545 NodeDistanceFunction - METHOD distance getDistance (Lnet/minecraft/class_6544$class_6548$class_6550;[F)F + METHOD distance getDistance (Lnet/minecraft/class_6544$class_6548$class_6550;[J)J ARG 1 node - ARG 2 otherParameters CLASS class_6546 ParameterRange + FIELD comp_103 min J + FIELD comp_104 max J FIELD field_34478 CODEC Lcom/mojang/serialization/Codec; - FIELD field_34479 min F - FIELD field_34480 max F - METHOD (FF)V - ARG 1 min - ARG 2 max + METHOD comp_103 min ()J + METHOD comp_104 max ()J METHOD equals (Ljava/lang/Object;)Z ARG 1 o - METHOD method_38119 getMin ()F - METHOD method_38122 getDistance (Lnet/minecraft/class_6544$class_6546;)F + METHOD method_38122 getDistance (Lnet/minecraft/class_6544$class_6546;)J ARG 1 other - METHOD method_38125 getMax ()F - METHOD method_38126 getDistance (F)F - ARG 1 noise + METHOD method_38126 getDistance (J)J METHOD method_38127 combine (Lnet/minecraft/class_6544$class_6546;)Lnet/minecraft/class_6544$class_6546; ARG 1 other CLASS class_6547 Entries @@ -115,7 +109,7 @@ CLASS net/minecraft/class_6544 net/minecraft/world/biome/source/util/MultiNoiseU CLASS class_6548 SearchTree FIELD field_34486 MAX_NODES_FOR_SIMPLE_TREE I FIELD field_34487 firstNode Lnet/minecraft/class_6544$class_6548$class_6550; - METHOD method_38146 (ILnet/minecraft/class_6544$class_6548$class_6550;)D + METHOD method_38146 (ILnet/minecraft/class_6544$class_6548$class_6550;)J ARG 1 node METHOD method_38147 (ILnet/minecraft/class_6544$class_6548$class_6551;)Lnet/minecraft/class_6544$class_6548$class_6550; ARG 1 node @@ -131,7 +125,7 @@ CLASS net/minecraft/class_6544 net/minecraft/world/biome/source/util/MultiNoiseU ARG 0 entries METHOD method_38154 sortTree (Ljava/util/List;IIZ)V ARG 0 subTree - METHOD method_38155 getRangeLengthSum ([Lnet/minecraft/class_6544$class_6546;)F + METHOD method_38155 getRangeLengthSum ([Lnet/minecraft/class_6544$class_6546;)J ARG 0 parameters METHOD method_38156 getBatchedTree (Ljava/util/List;)Ljava/util/List; ARG 0 nodes @@ -146,10 +140,8 @@ CLASS net/minecraft/class_6544 net/minecraft/world/biome/source/util/MultiNoiseU FIELD field_34490 parameters [Lnet/minecraft/class_6544$class_6546; METHOD (Ljava/util/List;)V ARG 1 subTree - METHOD method_38158 getResultingNode ([FLnet/minecraft/class_6544$class_6548$class_6549;Lnet/minecraft/class_6544$class_6545;)Lnet/minecraft/class_6544$class_6548$class_6549; - ARG 1 otherParameters - METHOD method_38159 getSquaredDistance ([F)F - ARG 1 otherParameters + METHOD method_38158 getResultingNode ([JLnet/minecraft/class_6544$class_6548$class_6549;Lnet/minecraft/class_6544$class_6545;)Lnet/minecraft/class_6544$class_6548$class_6549; + METHOD method_38159 getSquaredDistance ([J)J CLASS class_6551 TreeBranchNode FIELD field_34491 subTree [Lnet/minecraft/class_6544$class_6548$class_6550; METHOD (Ljava/util/List;Ljava/util/List;)V @@ -157,23 +149,16 @@ CLASS net/minecraft/class_6544 net/minecraft/world/biome/source/util/MultiNoiseU ARG 2 subTree CLASS class_6552 MultiNoiseSampler CLASS class_6553 NoiseValuePoint - FIELD field_34492 temperatureNoise F - FIELD field_34493 humidityNoise F - FIELD field_34494 continentalnessNoise F - FIELD field_34495 erosionNoise F - FIELD field_34496 depth F - FIELD field_34497 weirdnessNoise F - METHOD (FFFFFF)V - ARG 1 temperatureNoise - ARG 2 humidityNoise - ARG 3 continentalnessNoise - ARG 4 erosionNoise - ARG 5 depth - ARG 6 weirdnessNoise - METHOD method_38160 getTemperatureNoise ()F - METHOD method_38161 getHumidityNoise ()F - METHOD method_38162 getContinentalnessNoise ()F - METHOD method_38163 getErosionNoise ()F - METHOD method_38164 getDepth ()F - METHOD method_38165 getWeirdnessNoise ()F - METHOD method_38166 getNoiseValueList ()[F + FIELD comp_112 temperatureNoise J + FIELD comp_113 humidityNoise J + FIELD comp_114 continentalnessNoise J + FIELD comp_115 erosionNoise J + FIELD comp_116 depth J + FIELD comp_117 weirdnessNoise J + METHOD comp_112 temperatureNoise ()J + METHOD comp_113 humidityNoise ()J + METHOD comp_114 continentalnessNoise ()J + METHOD comp_115 erosionNoise ()J + METHOD comp_116 depth ()J + METHOD comp_117 weirdnessNoise ()J + METHOD method_38166 getNoiseValueList ()[J diff --git a/mappings/net/minecraft/world/gen/carver/CarverConfig.mapping b/mappings/net/minecraft/world/gen/carver/CarverConfig.mapping index eba3058f3e..b5e234031d 100644 --- a/mappings/net/minecraft/world/gen/carver/CarverConfig.mapping +++ b/mappings/net/minecraft/world/gen/carver/CarverConfig.mapping @@ -4,13 +4,10 @@ CLASS net/minecraft/class_5871 net/minecraft/world/gen/carver/CarverConfig FIELD field_31488 y Lnet/minecraft/class_6122; FIELD field_31489 yScale Lnet/minecraft/class_5863; FIELD field_31490 lavaLevel Lnet/minecraft/class_5843; - FIELD field_33610 aquifers Z - METHOD (FLnet/minecraft/class_6122;Lnet/minecraft/class_5863;Lnet/minecraft/class_5843;ZLnet/minecraft/class_5872;)V + METHOD (FLnet/minecraft/class_6122;Lnet/minecraft/class_5863;Lnet/minecraft/class_5843;Lnet/minecraft/class_5872;)V ARG 1 probability ARG 2 y ARG 3 yScale ARG 4 lavaLevel - ARG 5 aquifers - ARG 6 debugConfig METHOD method_33968 (Lcom/mojang/serialization/codecs/RecordCodecBuilder$Instance;)Lcom/mojang/datafixers/kinds/App; ARG 0 instance diff --git a/mappings/net/minecraft/world/gen/carver/CaveCarverConfig.mapping b/mappings/net/minecraft/world/gen/carver/CaveCarverConfig.mapping index f41305107c..f7a19c0faa 100644 --- a/mappings/net/minecraft/world/gen/carver/CaveCarverConfig.mapping +++ b/mappings/net/minecraft/world/gen/carver/CaveCarverConfig.mapping @@ -3,6 +3,11 @@ CLASS net/minecraft/class_6108 net/minecraft/world/gen/carver/CaveCarverConfig FIELD field_31492 horizontalRadiusMultiplier Lnet/minecraft/class_5863; FIELD field_31493 verticalRadiusMultiplier Lnet/minecraft/class_5863; FIELD field_31494 floorLevel Lnet/minecraft/class_5863; + METHOD (FLnet/minecraft/class_6122;Lnet/minecraft/class_5863;Lnet/minecraft/class_5843;Lnet/minecraft/class_5872;Lnet/minecraft/class_5863;Lnet/minecraft/class_5863;Lnet/minecraft/class_5863;)V + ARG 1 probability + ARG 2 y + ARG 3 yScale + ARG 4 lavaLevel METHOD (FLnet/minecraft/class_6122;Lnet/minecraft/class_5863;Lnet/minecraft/class_5843;ZLnet/minecraft/class_5863;Lnet/minecraft/class_5863;Lnet/minecraft/class_5863;)V ARG 1 probability ARG 2 y @@ -12,16 +17,6 @@ CLASS net/minecraft/class_6108 net/minecraft/world/gen/carver/CaveCarverConfig ARG 6 horizontalRadiusMultiplier ARG 7 verticalRadiusMultiplier ARG 8 floorLevel - METHOD (FLnet/minecraft/class_6122;Lnet/minecraft/class_5863;Lnet/minecraft/class_5843;ZLnet/minecraft/class_5872;Lnet/minecraft/class_5863;Lnet/minecraft/class_5863;Lnet/minecraft/class_5863;)V - ARG 1 probability - ARG 2 y - ARG 3 yScale - ARG 4 lavaLevel - ARG 5 aquifers - ARG 6 debugConfig - ARG 7 horizontalRadiusMultiplier - ARG 8 verticalRadiusMultiplier - ARG 9 floorLevel METHOD (Lnet/minecraft/class_5871;Lnet/minecraft/class_5863;Lnet/minecraft/class_5863;Lnet/minecraft/class_5863;)V ARG 1 config ARG 2 horizontalRadiusMultiplier diff --git a/mappings/net/minecraft/world/gen/carver/RavineCarverConfig.mapping b/mappings/net/minecraft/world/gen/carver/RavineCarverConfig.mapping index 1962b3e316..6762210f0f 100644 --- a/mappings/net/minecraft/world/gen/carver/RavineCarverConfig.mapping +++ b/mappings/net/minecraft/world/gen/carver/RavineCarverConfig.mapping @@ -2,15 +2,11 @@ CLASS net/minecraft/class_5869 net/minecraft/world/gen/carver/RavineCarverConfig FIELD field_29041 RAVINE_CODEC Lcom/mojang/serialization/Codec; FIELD field_31479 verticalRotation Lnet/minecraft/class_5863; FIELD field_31480 shape Lnet/minecraft/class_5869$class_6107; - METHOD (FLnet/minecraft/class_6122;Lnet/minecraft/class_5863;Lnet/minecraft/class_5843;ZLnet/minecraft/class_5872;Lnet/minecraft/class_5863;Lnet/minecraft/class_5869$class_6107;)V + METHOD (FLnet/minecraft/class_6122;Lnet/minecraft/class_5863;Lnet/minecraft/class_5843;Lnet/minecraft/class_5872;Lnet/minecraft/class_5863;Lnet/minecraft/class_5869$class_6107;)V ARG 1 probability ARG 2 y ARG 3 yScale ARG 4 lavaLevel - ARG 5 aquifers - ARG 6 debugConfig - ARG 7 verticalRotation - ARG 8 shape METHOD (Lnet/minecraft/class_5871;Lnet/minecraft/class_5863;Lnet/minecraft/class_5869$class_6107;)V ARG 1 config ARG 2 verticalRotation diff --git a/mappings/net/minecraft/world/gen/chunk/AquiferSampler.mapping b/mappings/net/minecraft/world/gen/chunk/AquiferSampler.mapping index e445ca3aa8..98506af983 100644 --- a/mappings/net/minecraft/world/gen/chunk/AquiferSampler.mapping +++ b/mappings/net/minecraft/world/gen/chunk/AquiferSampler.mapping @@ -46,3 +46,5 @@ CLASS net/minecraft/class_6350 net/minecraft/world/gen/chunk/AquiferSampler METHOD (ILnet/minecraft/class_2680;)V ARG 1 y ARG 2 state + CLASS class_6565 + METHOD computeFluid getFluidLevel (III)Lnet/minecraft/class_6350$class_6351; diff --git a/mappings/net/minecraft/world/gen/chunk/ChunkGenerator.mapping b/mappings/net/minecraft/world/gen/chunk/ChunkGenerator.mapping index 69a31c9a8b..1e389d50d0 100644 --- a/mappings/net/minecraft/world/gen/chunk/ChunkGenerator.mapping +++ b/mappings/net/minecraft/world/gen/chunk/ChunkGenerator.mapping @@ -39,8 +39,6 @@ CLASS net/minecraft/class_2794 net/minecraft/world/gen/chunk/ChunkGenerator COMMENT The radius is ignored for strongholds. COMMENT COMMENT @return {@code null} if no structure could be found within the given search radius - ARG 1 world - ARG 2 feature ARG 3 center ARG 4 radius COMMENT the search radius in chunks around the chunk the given block position is in; a radius of 0 will only search in the given chunk diff --git a/mappings/net/minecraft/world/gen/feature/BuriedTreasureFeature.mapping b/mappings/net/minecraft/world/gen/feature/BuriedTreasureFeature.mapping index a9c883ed22..70ec7ba2e4 100644 --- a/mappings/net/minecraft/world/gen/feature/BuriedTreasureFeature.mapping +++ b/mappings/net/minecraft/world/gen/feature/BuriedTreasureFeature.mapping @@ -1,3 +1,2 @@ CLASS net/minecraft/class_2956 net/minecraft/world/gen/feature/BuriedTreasureFeature FIELD field_31500 SALT I - CLASS class_2957 Start diff --git a/mappings/net/minecraft/world/gen/feature/DesertPyramidFeature.mapping b/mappings/net/minecraft/world/gen/feature/DesertPyramidFeature.mapping index c5a39bb645..6945d475ac 100644 --- a/mappings/net/minecraft/world/gen/feature/DesertPyramidFeature.mapping +++ b/mappings/net/minecraft/world/gen/feature/DesertPyramidFeature.mapping @@ -1,2 +1 @@ CLASS net/minecraft/class_3006 net/minecraft/world/gen/feature/DesertPyramidFeature - CLASS class_3007 Start diff --git a/mappings/net/minecraft/world/gen/feature/EndCityFeature.mapping b/mappings/net/minecraft/world/gen/feature/EndCityFeature.mapping index fad355609f..2634154f3a 100644 --- a/mappings/net/minecraft/world/gen/feature/EndCityFeature.mapping +++ b/mappings/net/minecraft/world/gen/feature/EndCityFeature.mapping @@ -1,3 +1,2 @@ CLASS net/minecraft/class_3021 net/minecraft/world/gen/feature/EndCityFeature METHOD method_13085 getGenerationHeight (Lnet/minecraft/class_1923;Lnet/minecraft/class_2794;Lnet/minecraft/class_5539;)I - CLASS class_3022 Start diff --git a/mappings/net/minecraft/world/gen/feature/IglooFeature.mapping b/mappings/net/minecraft/world/gen/feature/IglooFeature.mapping index 8f78a3444b..ecd273f9e2 100644 --- a/mappings/net/minecraft/world/gen/feature/IglooFeature.mapping +++ b/mappings/net/minecraft/world/gen/feature/IglooFeature.mapping @@ -1,2 +1 @@ CLASS net/minecraft/class_3071 net/minecraft/world/gen/feature/IglooFeature - CLASS class_3072 Start diff --git a/mappings/net/minecraft/world/gen/feature/JigsawFeature.mapping b/mappings/net/minecraft/world/gen/feature/JigsawFeature.mapping index e1c3bea931..4e8e525cd6 100644 --- a/mappings/net/minecraft/world/gen/feature/JigsawFeature.mapping +++ b/mappings/net/minecraft/world/gen/feature/JigsawFeature.mapping @@ -1,21 +1,6 @@ CLASS net/minecraft/class_5434 net/minecraft/world/gen/feature/JigsawFeature - FIELD field_25835 structureStartY I - FIELD field_25836 modifyBoundingBox Z - FIELD field_25837 surface Z METHOD (Lcom/mojang/serialization/Codec;IZZ)V ARG 1 codec ARG 2 structureStartY ARG 3 modifyBoundingBox ARG 4 surface - METHOD method_30386 (Lnet/minecraft/class_3195;Lnet/minecraft/class_1923;IJ)Lnet/minecraft/class_3449; - ARG 1 feature - ARG 2 pos - ARG 3 references - ARG 4 seed - CLASS class_5435 Start - FIELD field_25838 jigsawFeature Lnet/minecraft/class_5434; - METHOD (Lnet/minecraft/class_5434;Lnet/minecraft/class_1923;IJ)V - ARG 1 feature - ARG 2 pos - ARG 3 references - ARG 4 seed diff --git a/mappings/net/minecraft/world/gen/feature/JungleTempleFeature.mapping b/mappings/net/minecraft/world/gen/feature/JungleTempleFeature.mapping index 7aa9ce6a9e..e18cc9c4c1 100644 --- a/mappings/net/minecraft/world/gen/feature/JungleTempleFeature.mapping +++ b/mappings/net/minecraft/world/gen/feature/JungleTempleFeature.mapping @@ -1,2 +1 @@ CLASS net/minecraft/class_3076 net/minecraft/world/gen/feature/JungleTempleFeature - CLASS class_3077 Start diff --git a/mappings/net/minecraft/world/gen/feature/MineshaftFeature.mapping b/mappings/net/minecraft/world/gen/feature/MineshaftFeature.mapping index e3e8764f67..a38ea773f1 100644 --- a/mappings/net/minecraft/world/gen/feature/MineshaftFeature.mapping +++ b/mappings/net/minecraft/world/gen/feature/MineshaftFeature.mapping @@ -1,5 +1,4 @@ CLASS net/minecraft/class_3098 net/minecraft/world/gen/feature/MineshaftFeature - CLASS class_3099 Start CLASS class_3100 Type FIELD field_13689 name Ljava/lang/String; FIELD field_13690 BY_NAME Ljava/util/Map; diff --git a/mappings/net/minecraft/world/gen/feature/NetherFortressFeature.mapping b/mappings/net/minecraft/world/gen/feature/NetherFortressFeature.mapping index 9136c72a0a..6d294b478b 100644 --- a/mappings/net/minecraft/world/gen/feature/NetherFortressFeature.mapping +++ b/mappings/net/minecraft/world/gen/feature/NetherFortressFeature.mapping @@ -1,3 +1,2 @@ CLASS net/minecraft/class_3108 net/minecraft/world/gen/feature/NetherFortressFeature FIELD field_13705 MONSTER_SPAWNS Lnet/minecraft/class_6012; - CLASS class_3109 Start diff --git a/mappings/net/minecraft/world/gen/feature/NetherFossilFeature.mapping b/mappings/net/minecraft/world/gen/feature/NetherFossilFeature.mapping index 85700d9d63..e63b21ba18 100644 --- a/mappings/net/minecraft/world/gen/feature/NetherFossilFeature.mapping +++ b/mappings/net/minecraft/world/gen/feature/NetherFossilFeature.mapping @@ -1,2 +1 @@ CLASS net/minecraft/class_4785 net/minecraft/world/gen/feature/NetherFossilFeature - CLASS class_4786 Start diff --git a/mappings/net/minecraft/world/gen/feature/OceanMonumentFeature.mapping b/mappings/net/minecraft/world/gen/feature/OceanMonumentFeature.mapping index 2833121926..18d3dbf800 100644 --- a/mappings/net/minecraft/world/gen/feature/OceanMonumentFeature.mapping +++ b/mappings/net/minecraft/world/gen/feature/OceanMonumentFeature.mapping @@ -1,3 +1,2 @@ CLASS net/minecraft/class_3116 net/minecraft/world/gen/feature/OceanMonumentFeature FIELD field_13716 MONSTER_SPAWNS Lnet/minecraft/class_6012; - CLASS class_3117 Start diff --git a/mappings/net/minecraft/world/gen/feature/OceanRuinFeature.mapping b/mappings/net/minecraft/world/gen/feature/OceanRuinFeature.mapping index 46b02d3c83..47b61880bb 100644 --- a/mappings/net/minecraft/world/gen/feature/OceanRuinFeature.mapping +++ b/mappings/net/minecraft/world/gen/feature/OceanRuinFeature.mapping @@ -1,5 +1,4 @@ CLASS net/minecraft/class_3411 net/minecraft/world/gen/feature/OceanRuinFeature - CLASS class_3412 Start CLASS class_3413 BiomeType FIELD field_14529 name Ljava/lang/String; FIELD field_14530 BY_NAME Ljava/util/Map; diff --git a/mappings/net/minecraft/world/gen/feature/RuinedPortalFeature.mapping b/mappings/net/minecraft/world/gen/feature/RuinedPortalFeature.mapping index 1417be7358..ad422b0cb3 100644 --- a/mappings/net/minecraft/world/gen/feature/RuinedPortalFeature.mapping +++ b/mappings/net/minecraft/world/gen/feature/RuinedPortalFeature.mapping @@ -17,7 +17,6 @@ CLASS net/minecraft/class_5183 net/minecraft/world/gen/feature/RuinedPortalFeatu ARG 5 blockCountY ARG 6 box ARG 7 world - CLASS class_5184 Start CLASS class_5185 Type FIELD field_24007 BY_NAME Ljava/util/Map; FIELD field_24008 name Ljava/lang/String; diff --git a/mappings/net/minecraft/world/gen/feature/ShipwreckFeature.mapping b/mappings/net/minecraft/world/gen/feature/ShipwreckFeature.mapping index d091c09623..65de26cc66 100644 --- a/mappings/net/minecraft/world/gen/feature/ShipwreckFeature.mapping +++ b/mappings/net/minecraft/world/gen/feature/ShipwreckFeature.mapping @@ -1,2 +1 @@ CLASS net/minecraft/class_3170 net/minecraft/world/gen/feature/ShipwreckFeature - CLASS class_3171 Start diff --git a/mappings/net/minecraft/world/gen/feature/StrongholdFeature.mapping b/mappings/net/minecraft/world/gen/feature/StrongholdFeature.mapping index 62b0e2ad4d..721ff8ea0a 100644 --- a/mappings/net/minecraft/world/gen/feature/StrongholdFeature.mapping +++ b/mappings/net/minecraft/world/gen/feature/StrongholdFeature.mapping @@ -1,3 +1 @@ CLASS net/minecraft/class_3188 net/minecraft/world/gen/feature/StrongholdFeature - CLASS class_3189 Start - FIELD field_24559 seed J diff --git a/mappings/net/minecraft/world/gen/feature/StructureFeature.mapping b/mappings/net/minecraft/world/gen/feature/StructureFeature.mapping index 2d34c7ba89..2fdcc5cd4f 100644 --- a/mappings/net/minecraft/world/gen/feature/StructureFeature.mapping +++ b/mappings/net/minecraft/world/gen/feature/StructureFeature.mapping @@ -1,15 +1,10 @@ CLASS net/minecraft/class_3195 net/minecraft/world/gen/feature/StructureFeature FIELD field_13879 LOGGER Lorg/apache/logging/log4j/Logger; FIELD field_24842 STRUCTURES Lcom/google/common/collect/BiMap; - FIELD field_24851 SWAMP_HUT Lnet/minecraft/class_3197; + FIELD field_24851 SWAMP_HUT Lnet/minecraft/class_3195; FIELD field_24861 LAND_MODIFYING_STRUCTURES Ljava/util/List; FIELD field_24862 STRUCTURE_TO_GENERATION_STEP Ljava/util/Map; FIELD field_24863 codec Lcom/mojang/serialization/Codec; - FIELD field_25839 JIGSAW_STRUCTURE_PIECES Ljava/util/Map; - FIELD field_26362 JIGSAW_ID Lnet/minecraft/class_2960; - METHOD (Lcom/mojang/serialization/Codec;)V - ARG 1 codec - METHOD method_13149 getMonsterSpawns ()Lnet/minecraft/class_6012; METHOD method_14015 locateStructure (Lnet/minecraft/class_4538;Lnet/minecraft/class_5138;Lnet/minecraft/class_2338;IZJLnet/minecraft/class_5314;)Lnet/minecraft/class_2338; COMMENT Tries to find the closest structure of this type near a given block. COMMENT

@@ -27,7 +22,6 @@ CLASS net/minecraft/class_3195 net/minecraft/world/gen/feature/StructureFeature ARG 5 skipExistingChunks ARG 6 worldSeed ARG 8 config - METHOD method_14016 getStructureStartFactory ()Lnet/minecraft/class_3195$class_3774; METHOD method_14019 getName ()Ljava/lang/String; METHOD method_14026 shouldStartAt (Lnet/minecraft/class_2794;Lnet/minecraft/class_1966;JLnet/minecraft/class_2919;Lnet/minecraft/class_1923;Lnet/minecraft/class_1923;Lnet/minecraft/class_3037;Lnet/minecraft/class_5539;)Z COMMENT Checks if this structure can actually be placed at a potential structure position determined via @@ -38,7 +32,6 @@ CLASS net/minecraft/class_3195 net/minecraft/world/gen/feature/StructureFeature ARG 3 worldSeed ARG 5 random ARG 6 pos - METHOD method_16140 getCreatureSpawns ()Lnet/minecraft/class_6012; METHOD method_27218 getStartChunk (Lnet/minecraft/class_5314;JLnet/minecraft/class_2919;II)Lnet/minecraft/class_1923; COMMENT Determines the cell of the structure placement grid a chunk belongs to, and COMMENT returns the chunk within that cell, that this structure will actually be placed at. @@ -58,8 +51,6 @@ CLASS net/minecraft/class_3195 net/minecraft/world/gen/feature/StructureFeature COMMENT If true, this structure's start position will be uniformly distributed within COMMENT a placement grid cell. If false, the structure's starting point will be biased COMMENT towards the center of the cell. - METHOD method_28656 createStart (Lnet/minecraft/class_1923;IJ)Lnet/minecraft/class_3449; - ARG 1 pos METHOD method_28657 tryPlaceStart (Lnet/minecraft/class_5455;Lnet/minecraft/class_2794;Lnet/minecraft/class_1966;Lnet/minecraft/class_3485;JLnet/minecraft/class_1923;ILnet/minecraft/class_2919;Lnet/minecraft/class_5314;Lnet/minecraft/class_3037;Lnet/minecraft/class_5539;Ljava/util/function/Predicate;)Lnet/minecraft/class_3449; COMMENT Tries to place a starting point for this type of structure in the given chunk. COMMENT

@@ -72,8 +63,7 @@ CLASS net/minecraft/class_3195 net/minecraft/world/gen/feature/StructureFeature ARG 7 pos METHOD method_28659 configure (Lnet/minecraft/class_3037;)Lnet/minecraft/class_5312; ARG 1 config - METHOD method_28660 readStructureStart (Lnet/minecraft/class_3218;Lnet/minecraft/class_2487;J)Lnet/minecraft/class_3449; - ARG 0 world + METHOD method_28660 readStructureStart (Lnet/minecraft/class_6625;Lnet/minecraft/class_2487;J)Lnet/minecraft/class_3449; ARG 1 nbt ARG 2 worldSeed METHOD method_28661 register (Ljava/lang/String;Lnet/minecraft/class_3195;Lnet/minecraft/class_2893$class_2895;)Lnet/minecraft/class_3195; @@ -85,30 +75,4 @@ CLASS net/minecraft/class_3195 net/minecraft/world/gen/feature/StructureFeature COMMENT Structures will generate before other features in the same generation step. METHOD method_28664 init ()V METHOD method_28665 getCodec ()Lcom/mojang/serialization/Codec; - METHOD method_36420 getUndergroundWaterCreatureSpawns ()Lnet/minecraft/class_6012; - METHOD method_38428 getCornerInGroundHeights (Lnet/minecraft/class_2794;IIIILnet/minecraft/class_5539;)[I - ARG 0 generator - ARG 1 x - ARG 2 deltaX - ARG 3 z - ARG 4 deltaZ - ARG 5 world - METHOD method_38429 getLowestCornerInGroundHeight (Lnet/minecraft/class_2794;IILnet/minecraft/class_1923;Lnet/minecraft/class_5539;)I - ARG 0 generator - ARG 1 deltaX - ARG 2 deltaZ - ARG 3 chunkPos - ARG 4 world - METHOD method_38430 checkBiome (Lnet/minecraft/class_2794;Lnet/minecraft/class_5539;Ljava/util/function/Predicate;Lnet/minecraft/class_2902$class_2903;II)Z - ARG 0 generator - ARG 1 world - ARG 2 biomePredicate - ARG 3 heightmap - ARG 4 x - ARG 5 z - CLASS class_3774 StructureStartFactory - METHOD create (Lnet/minecraft/class_3195;Lnet/minecraft/class_1923;IJ)Lnet/minecraft/class_3449; - ARG 1 feature - ARG 2 pos - ARG 3 references - ARG 4 seed + METHOD method_36217 calculateBoundingBox (Lnet/minecraft/class_3341;)Lnet/minecraft/class_3341; diff --git a/mappings/net/minecraft/world/gen/feature/SwampHutFeature.mapping b/mappings/net/minecraft/world/gen/feature/SwampHutFeature.mapping index a1d8d635f3..fe19b4388f 100644 --- a/mappings/net/minecraft/world/gen/feature/SwampHutFeature.mapping +++ b/mappings/net/minecraft/world/gen/feature/SwampHutFeature.mapping @@ -1,4 +1,3 @@ CLASS net/minecraft/class_3197 net/minecraft/world/gen/feature/SwampHutFeature FIELD field_13882 MONSTER_SPAWNS Lnet/minecraft/class_6012; FIELD field_16435 CREATURE_SPAWNS Lnet/minecraft/class_6012; - CLASS class_3198 Start diff --git a/mappings/net/minecraft/world/gen/feature/TreeFeatureConfig.mapping b/mappings/net/minecraft/world/gen/feature/TreeFeatureConfig.mapping index 2eff7b211a..2f08f723f9 100644 --- a/mappings/net/minecraft/world/gen/feature/TreeFeatureConfig.mapping +++ b/mappings/net/minecraft/world/gen/feature/TreeFeatureConfig.mapping @@ -9,20 +9,10 @@ CLASS net/minecraft/class_4643 net/minecraft/world/gen/feature/TreeFeatureConfig FIELD field_29279 dirtProvider Lnet/minecraft/class_4651; FIELD field_29280 foliageProvider Lnet/minecraft/class_4651; FIELD field_29281 forceDirt Z - FIELD field_33933 saplingProvider Lnet/minecraft/class_4651; - METHOD (Lnet/minecraft/class_4651;Lnet/minecraft/class_5141;Lnet/minecraft/class_4651;Lnet/minecraft/class_4651;Lnet/minecraft/class_4647;Lnet/minecraft/class_4651;Lnet/minecraft/class_5201;Ljava/util/List;ZZ)V + METHOD (Lnet/minecraft/class_4651;Lnet/minecraft/class_5141;Lnet/minecraft/class_4651;Lnet/minecraft/class_4647;Lnet/minecraft/class_4651;Lnet/minecraft/class_5201;Ljava/util/List;ZZ)V ARG 1 trunkProvider ARG 2 trunkPlacer ARG 3 foliageProvider - ARG 4 saplingProvider - ARG 5 foliagePlacer - ARG 6 dirtProvider - ARG 7 minimumSize - ARG 8 decorators - ARG 9 ignoreVines - ARG 10 forceDirt - METHOD method_27373 setTreeDecorators (Ljava/util/List;)Lnet/minecraft/class_4643; - ARG 1 decorators METHOD method_28811 (Lcom/mojang/serialization/codecs/RecordCodecBuilder$Instance;)Lcom/mojang/datafixers/kinds/App; ARG 0 instance CLASS class_4644 Builder @@ -35,14 +25,10 @@ CLASS net/minecraft/class_4643 net/minecraft/world/gen/feature/TreeFeatureConfig FIELD field_29282 foliageProvider Lnet/minecraft/class_4651; FIELD field_29283 dirtProvider Lnet/minecraft/class_4651; FIELD field_29284 forceDirt Z - FIELD field_33934 saplingProvider Lnet/minecraft/class_4651; - METHOD (Lnet/minecraft/class_4651;Lnet/minecraft/class_5141;Lnet/minecraft/class_4651;Lnet/minecraft/class_4651;Lnet/minecraft/class_4647;Lnet/minecraft/class_5201;)V + METHOD (Lnet/minecraft/class_4651;Lnet/minecraft/class_5141;Lnet/minecraft/class_4651;Lnet/minecraft/class_4647;Lnet/minecraft/class_5201;)V ARG 1 trunkProvider ARG 2 trunkPlacer ARG 3 foliageProvider - ARG 4 saplingProvider - ARG 5 foliagePlacer - ARG 6 minimumSize METHOD method_23445 build ()Lnet/minecraft/class_4643; METHOD method_27374 ignoreVines ()Lnet/minecraft/class_4643$class_4644; METHOD method_27376 decorators (Ljava/util/List;)Lnet/minecraft/class_4643$class_4644; diff --git a/mappings/net/minecraft/world/gen/feature/WoodlandMansionFeature.mapping b/mappings/net/minecraft/world/gen/feature/WoodlandMansionFeature.mapping index 7040af5f7d..737fd1d29c 100644 --- a/mappings/net/minecraft/world/gen/feature/WoodlandMansionFeature.mapping +++ b/mappings/net/minecraft/world/gen/feature/WoodlandMansionFeature.mapping @@ -1,2 +1 @@ CLASS net/minecraft/class_3223 net/minecraft/world/gen/feature/WoodlandMansionFeature - CLASS class_3224 Start