diff --git a/build.gradle b/build.gradle index f267ff51e6..338bf6d7b4 100644 --- a/build.gradle +++ b/build.gradle @@ -27,7 +27,7 @@ plugins { id 'net.fabricmc.filament' version '0.3.0' } -def minecraft_version = "22w14a" +def minecraft_version = "22w15a" def ENV = System.getenv() // Fetch build number from Github Actions diff --git a/mappings/net/minecraft/advancement/criterion/Criteria.mapping b/mappings/net/minecraft/advancement/criterion/Criteria.mapping index 796d1d09a5..a22e3b0681 100644 --- a/mappings/net/minecraft/advancement/criterion/Criteria.mapping +++ b/mappings/net/minecraft/advancement/criterion/Criteria.mapping @@ -48,7 +48,7 @@ CLASS net/minecraft/class_174 net/minecraft/advancement/criterion/Criteria FIELD field_35013 FALL_FROM_HEIGHT Lnet/minecraft/class_2108; FIELD field_35014 RIDE_ENTITY_IN_LAVA Lnet/minecraft/class_2108; FIELD field_38376 KILL_MOB_NEAR_SCULK_CATALYST Lnet/minecraft/class_2080; - FIELD field_38700 ITEM_DELIVERED_TO_PLAYER Lnet/minecraft/class_2135; + FIELD field_38700 ITEM_DELIVERED_TO_PLAYER Lnet/minecraft/class_5279; FIELD field_38701 ALLAY_DROP_ITEM_ON_BLOCK Lnet/minecraft/class_4711; METHOD method_765 getById (Lnet/minecraft/class_2960;)Lnet/minecraft/class_179; ARG 0 id diff --git a/mappings/net/minecraft/advancement/criterion/ThrownItemPickedUpByEntityCriterion.mapping b/mappings/net/minecraft/advancement/criterion/ThrownItemPickedUpByEntityCriterion.mapping index 88613aa570..1f24b269f0 100644 --- a/mappings/net/minecraft/advancement/criterion/ThrownItemPickedUpByEntityCriterion.mapping +++ b/mappings/net/minecraft/advancement/criterion/ThrownItemPickedUpByEntityCriterion.mapping @@ -9,13 +9,8 @@ CLASS net/minecraft/class_5279 net/minecraft/advancement/criterion/ThrownItemPic CLASS class_5280 Conditions FIELD field_24493 item Lnet/minecraft/class_2073; FIELD field_24494 entity Lnet/minecraft/class_2048$class_5258; - METHOD (Lnet/minecraft/class_2048$class_5258;Lnet/minecraft/class_2073;Lnet/minecraft/class_2048$class_5258;)V - ARG 1 player - ARG 2 item - ARG 3 entity - METHOD method_27978 create (Lnet/minecraft/class_2048$class_5258;Lnet/minecraft/class_2073$class_2074;Lnet/minecraft/class_2048$class_5258;)Lnet/minecraft/class_5279$class_5280; + METHOD method_27978 create (Lnet/minecraft/class_2048$class_5258;Lnet/minecraft/class_2073;Lnet/minecraft/class_2048$class_5258;)Lnet/minecraft/class_5279$class_5280; ARG 0 player - ARG 1 item ARG 2 entity METHOD method_27979 test (Lnet/minecraft/class_3222;Lnet/minecraft/class_1799;Lnet/minecraft/class_47;)Z ARG 1 player diff --git a/mappings/net/minecraft/advancement/criterion/TickCriterion.mapping b/mappings/net/minecraft/advancement/criterion/TickCriterion.mapping index c9f709533a..a81e9c6e2c 100644 --- a/mappings/net/minecraft/advancement/criterion/TickCriterion.mapping +++ b/mappings/net/minecraft/advancement/criterion/TickCriterion.mapping @@ -16,4 +16,3 @@ CLASS net/minecraft/class_2135 net/minecraft/advancement/criterion/TickCriterion ARG 0 location METHOD method_43138 createSleptInBed ()Lnet/minecraft/class_2135$class_2137; METHOD method_43139 createHeroOfTheVillage ()Lnet/minecraft/class_2135$class_2137; - METHOD method_43140 createItemDeliveredToPlayer ()Lnet/minecraft/class_2135$class_2137; diff --git a/mappings/net/minecraft/block/AbstractBlock.mapping b/mappings/net/minecraft/block/AbstractBlock.mapping index c4fecaef48..a678899839 100644 --- a/mappings/net/minecraft/block/AbstractBlock.mapping +++ b/mappings/net/minecraft/block/AbstractBlock.mapping @@ -23,7 +23,6 @@ CLASS net/minecraft/class_4970 net/minecraft/block/AbstractBlock FIELD field_23165 jumpVelocityMultiplier F METHOD (Lnet/minecraft/class_4970$class_2251;)V ARG 1 settings - METHOD method_16841 getOffsetType ()Lnet/minecraft/class_4970$class_2250; METHOD method_17454 createScreenHandlerFactory (Lnet/minecraft/class_2680;Lnet/minecraft/class_1937;Lnet/minecraft/class_2338;)Lnet/minecraft/class_3908; COMMENT @deprecated Consider calling {@link AbstractBlockState#createScreenHandlerFactory} instead. See the class javadoc. ARG 1 state @@ -310,7 +309,6 @@ CLASS net/minecraft/class_4970 net/minecraft/block/AbstractBlock FIELD field_23186 emissiveLightingPredicate Lnet/minecraft/class_4970$class_4973; FIELD field_25185 toolRequired Z METHOD (Lnet/minecraft/class_3614;Ljava/util/function/Function;)V - ARG 1 material ARG 2 mapColorProvider METHOD (Lnet/minecraft/class_3614;Lnet/minecraft/class_3620;)V ARG 1 material diff --git a/mappings/net/minecraft/block/entity/SculkSpreadManager.mapping b/mappings/net/minecraft/block/entity/SculkSpreadManager.mapping index f6a8440bdd..a49fd4f608 100644 --- a/mappings/net/minecraft/block/entity/SculkSpreadManager.mapping +++ b/mappings/net/minecraft/block/entity/SculkSpreadManager.mapping @@ -45,7 +45,7 @@ CLASS net/minecraft/class_7128 net/minecraft/block/entity/SculkSpreadManager METHOD method_41494 clearCursors ()V CLASS class_7129 Cursor FIELD field_37623 CODEC Lcom/mojang/serialization/Codec; - FIELD field_37624 OFFSETS Ljava/util/List; + FIELD field_37624 OFFSETS Lit/unimi/dsi/fastutil/objects/ObjectArrayList; FIELD field_37625 pos Lnet/minecraft/class_2338; FIELD field_37626 charge I FIELD field_37627 update I @@ -92,8 +92,6 @@ CLASS net/minecraft/class_7128 net/minecraft/block/entity/SculkSpreadManager ARG 0 state METHOD method_41504 (Lnet/minecraft/class_2338;)Z ARG 0 pos - METHOD method_41505 (Ljava/util/ArrayList;)V - ARG 0 offsets METHOD method_41506 (Ljava/util/List;)Ljava/util/Set; ARG 0 directions METHOD method_41507 shuffleOffsets (Lnet/minecraft/class_5819;)Ljava/util/List; diff --git a/mappings/net/minecraft/client/MinecraftClient.mapping b/mappings/net/minecraft/client/MinecraftClient.mapping index 0323191e92..4fc9b0caa9 100644 --- a/mappings/net/minecraft/client/MinecraftClient.mapping +++ b/mappings/net/minecraft/client/MinecraftClient.mapping @@ -90,7 +90,6 @@ CLASS net/minecraft/class_310 net/minecraft/client/MinecraftClient FIELD field_1733 searchManager Lnet/minecraft/class_1124; FIELD field_1734 paused Z FIELD field_1735 fpsCounter I - FIELD field_1737 heldItemRenderer Lnet/minecraft/class_759; FIELD field_1738 currentFps I FIELD field_1739 networkProxy Ljava/net/Proxy; FIELD field_17404 renderTaskQueue Ljava/util/Queue; @@ -187,7 +186,6 @@ CLASS net/minecraft/class_310 net/minecraft/client/MinecraftClient ARG 0 stack METHOD method_1487 getNetworkProxy ()Ljava/net/Proxy; METHOD method_1488 getTickDelta ()F - METHOD method_1489 getHeldItemRenderer ()Lnet/minecraft/class_759; METHOD method_1490 stop ()V METHOD method_1492 drawProfilerResults (Lnet/minecraft/class_4587;Lnet/minecraft/class_3696;)V ARG 1 matrices diff --git a/mappings/net/minecraft/client/gui/hud/InGameHud.mapping b/mappings/net/minecraft/client/gui/hud/InGameHud.mapping index 77837280e7..3bb7b27fb6 100644 --- a/mappings/net/minecraft/client/gui/hud/InGameHud.mapping +++ b/mappings/net/minecraft/client/gui/hud/InGameHud.mapping @@ -43,8 +43,6 @@ CLASS net/minecraft/class_329 net/minecraft/client/gui/hud/InGameHud FIELD field_35428 autosaveIndicatorAlpha F FIELD field_35429 lastAutosaveIndicatorAlpha F FIELD field_35430 SAVING_LEVEL_TEXT Lnet/minecraft/class_2561; - METHOD (Lnet/minecraft/class_310;)V - ARG 1 client METHOD method_1731 updateVignetteDarkness (Lnet/minecraft/class_1297;)V ARG 1 entity METHOD method_1732 setRecordPlayingOverlay (Lnet/minecraft/class_2561;)V diff --git a/mappings/net/minecraft/client/network/ClientPlayNetworkHandler.mapping b/mappings/net/minecraft/client/network/ClientPlayNetworkHandler.mapping index 544e263cac..6236fe0b26 100644 --- a/mappings/net/minecraft/client/network/ClientPlayNetworkHandler.mapping +++ b/mappings/net/minecraft/client/network/ClientPlayNetworkHandler.mapping @@ -58,8 +58,6 @@ CLASS net/minecraft/class_634 net/minecraft/client/network/ClientPlayNetworkHand METHOD method_2885 feedbackAfterDownload (Ljava/util/concurrent/CompletableFuture;)V ARG 1 downloadFuture METHOD method_2886 getCommandDispatcher ()Lcom/mojang/brigadier/CommandDispatcher; - METHOD method_2888 validateResourcePackUrl (Ljava/lang/String;)Z - ARG 1 url METHOD method_2890 getWorld ()Lnet/minecraft/class_638; METHOD method_29091 getRegistryManager ()Lnet/minecraft/class_5455; METHOD method_29356 getWorldKeys ()Ljava/util/Set; @@ -77,7 +75,7 @@ CLASS net/minecraft/class_634 net/minecraft/client/network/ClientPlayNetworkHand ARG 2 recipe METHOD method_34012 (Lnet/minecraft/class_299;Lnet/minecraft/class_516;)V ARG 1 recipeResultCollection - METHOD method_34014 (Ljava/lang/String;Ljava/lang/String;ZZ)V + METHOD method_34014 (Ljava/net/URL;Ljava/lang/String;ZZ)V ARG 4 enabled METHOD method_36322 getServerResourcePackPrompt (Lnet/minecraft/class_2561;Lnet/minecraft/class_2561;)Lnet/minecraft/class_2561; ARG 0 defaultPrompt diff --git a/mappings/net/minecraft/client/render/GameRenderer.mapping b/mappings/net/minecraft/client/render/GameRenderer.mapping index a8556589b4..b44d25ab80 100644 --- a/mappings/net/minecraft/client/render/GameRenderer.mapping +++ b/mappings/net/minecraft/client/render/GameRenderer.mapping @@ -97,10 +97,6 @@ CLASS net/minecraft/class_757 net/minecraft/client/render/GameRenderer FIELD field_4027 ticks I FIELD field_4028 lightmapTextureManager Lnet/minecraft/class_765; FIELD field_4029 floatingItemWidth F - METHOD (Lnet/minecraft/class_310;Lnet/minecraft/class_3300;Lnet/minecraft/class_4599;)V - ARG 1 client - ARG 2 resourceManager - ARG 3 buffers METHOD method_18144 (Lnet/minecraft/class_1297;)Z ARG 0 entity METHOD method_19418 getCamera ()Lnet/minecraft/class_4184; diff --git a/mappings/net/minecraft/client/render/VertexFormat.mapping b/mappings/net/minecraft/client/render/VertexFormat.mapping index ddfa0e876b..adb5a42d8f 100644 --- a/mappings/net/minecraft/client/render/VertexFormat.mapping +++ b/mappings/net/minecraft/client/render/VertexFormat.mapping @@ -37,7 +37,7 @@ CLASS net/minecraft/class_293 net/minecraft/client/render/VertexFormat FIELD field_27383 mode I FIELD field_27384 vertexCount I FIELD field_27385 size I - METHOD (Ljava/lang/String;IIII)V + METHOD (Ljava/lang/String;IIIIZ)V ARG 3 mode ARG 4 vertexCount ARG 5 size diff --git a/mappings/net/minecraft/client/render/WorldRenderer.mapping b/mappings/net/minecraft/client/render/WorldRenderer.mapping index 79cde57aa0..0d794abe2b 100644 --- a/mappings/net/minecraft/client/render/WorldRenderer.mapping +++ b/mappings/net/minecraft/client/render/WorldRenderer.mapping @@ -63,9 +63,6 @@ CLASS net/minecraft/class_761 net/minecraft/client/render/WorldRenderer FIELD field_4119 playingSongs Ljava/util/Map; FIELD field_4120 lastCameraChunkUpdateY D FIELD field_4121 cameraChunkZ I - METHOD (Lnet/minecraft/class_310;Lnet/minecraft/class_4599;)V - ARG 1 client - ARG 2 bufferBuilders METHOD method_16037 scheduleSectionRender (Lnet/minecraft/class_2338;Z)V ARG 1 pos ARG 2 important diff --git a/mappings/net/minecraft/client/render/block/BlockModelRenderer.mapping b/mappings/net/minecraft/client/render/block/BlockModelRenderer.mapping index 851a9d4bb6..fe51a531c7 100644 --- a/mappings/net/minecraft/client/render/block/BlockModelRenderer.mapping +++ b/mappings/net/minecraft/client/render/block/BlockModelRenderer.mapping @@ -46,8 +46,6 @@ CLASS net/minecraft/class_778 net/minecraft/client/render/block/BlockModelRender ARG 9 ambientOcclusionCalculator ARG 10 overlay METHOD method_3364 getQuadDimensions (Lnet/minecraft/class_1920;Lnet/minecraft/class_2680;Lnet/minecraft/class_2338;[ILnet/minecraft/class_2350;[FLjava/util/BitSet;)V - ARG 1 world - ARG 2 state ARG 3 pos ARG 4 vertexData ARG 5 face diff --git a/mappings/net/minecraft/client/render/block/entity/BlockEntityRenderDispatcher.mapping b/mappings/net/minecraft/client/render/block/entity/BlockEntityRenderDispatcher.mapping index 377d72584e..e9f6b71b55 100644 --- a/mappings/net/minecraft/client/render/block/entity/BlockEntityRenderDispatcher.mapping +++ b/mappings/net/minecraft/client/render/block/entity/BlockEntityRenderDispatcher.mapping @@ -6,8 +6,7 @@ CLASS net/minecraft/class_824 net/minecraft/client/render/block/entity/BlockEnti FIELD field_4345 renderers Ljava/util/Map; FIELD field_4348 world Lnet/minecraft/class_1937; FIELD field_4350 crosshairTarget Lnet/minecraft/class_239; - METHOD (Lnet/minecraft/class_327;Lnet/minecraft/class_5599;Ljava/util/function/Supplier;)V - ARG 1 textRenderer + METHOD (Lnet/minecraft/class_327;Lnet/minecraft/class_5599;Ljava/util/function/Supplier;Ljava/util/function/Supplier;Ljava/util/function/Supplier;)V ARG 2 entityModelLoader ARG 3 blockRenderManager METHOD method_23077 renderEntity (Lnet/minecraft/class_2586;Lnet/minecraft/class_4587;Lnet/minecraft/class_4597;II)Z diff --git a/mappings/net/minecraft/client/render/block/entity/BlockEntityRendererFactory.mapping b/mappings/net/minecraft/client/render/block/entity/BlockEntityRendererFactory.mapping index 9880cb419d..da77fa8396 100644 --- a/mappings/net/minecraft/client/render/block/entity/BlockEntityRendererFactory.mapping +++ b/mappings/net/minecraft/client/render/block/entity/BlockEntityRendererFactory.mapping @@ -6,11 +6,9 @@ CLASS net/minecraft/class_5614 net/minecraft/client/render/block/entity/BlockEnt FIELD field_27749 renderManager Lnet/minecraft/class_776; FIELD field_27750 layerRenderDispatcher Lnet/minecraft/class_5599; FIELD field_27751 textRenderer Lnet/minecraft/class_327; - METHOD (Lnet/minecraft/class_824;Lnet/minecraft/class_776;Lnet/minecraft/class_5599;Lnet/minecraft/class_327;)V + METHOD (Lnet/minecraft/class_824;Lnet/minecraft/class_776;Lnet/minecraft/class_918;Lnet/minecraft/class_898;Lnet/minecraft/class_5599;Lnet/minecraft/class_327;)V ARG 1 renderDispatcher ARG 2 renderManager - ARG 3 layerRenderDispatcher - ARG 4 textRenderer METHOD method_32139 getRenderDispatcher ()Lnet/minecraft/class_824; METHOD method_32140 getLayerModelPart (Lnet/minecraft/class_5601;)Lnet/minecraft/class_630; ARG 1 modelLayer diff --git a/mappings/net/minecraft/client/render/entity/EntityRenderDispatcher.mapping b/mappings/net/minecraft/client/render/entity/EntityRenderDispatcher.mapping index de68105d88..676a6c036d 100644 --- a/mappings/net/minecraft/client/render/entity/EntityRenderDispatcher.mapping +++ b/mappings/net/minecraft/client/render/entity/EntityRenderDispatcher.mapping @@ -13,12 +13,6 @@ CLASS net/minecraft/class_898 net/minecraft/client/render/entity/EntityRenderDis FIELD field_4689 textRenderer Lnet/minecraft/class_327; FIELD field_4692 gameOptions Lnet/minecraft/class_315; FIELD field_4696 renderers Ljava/util/Map; - METHOD (Lnet/minecraft/class_1060;Lnet/minecraft/class_918;Lnet/minecraft/class_327;Lnet/minecraft/class_315;Lnet/minecraft/class_5599;)V - ARG 1 textureManager - ARG 2 itemRenderer - ARG 3 textRenderer - ARG 4 gameOptions - ARG 5 modelLoader METHOD method_23161 drawFireVertex (Lnet/minecraft/class_4587$class_4665;Lnet/minecraft/class_4588;FFFFF)V ARG 0 entry ARG 1 vertices diff --git a/mappings/net/minecraft/client/render/entity/EntityRendererFactory.mapping b/mappings/net/minecraft/client/render/entity/EntityRendererFactory.mapping index 816268f2b9..5936c6637b 100644 --- a/mappings/net/minecraft/client/render/entity/EntityRendererFactory.mapping +++ b/mappings/net/minecraft/client/render/entity/EntityRendererFactory.mapping @@ -7,12 +7,9 @@ CLASS net/minecraft/class_5617 net/minecraft/client/render/entity/EntityRenderer FIELD field_27764 resourceManager Lnet/minecraft/class_3300; FIELD field_27765 modelLoader Lnet/minecraft/class_5599; FIELD field_27766 textRenderer Lnet/minecraft/class_327; - METHOD (Lnet/minecraft/class_898;Lnet/minecraft/class_918;Lnet/minecraft/class_3300;Lnet/minecraft/class_5599;Lnet/minecraft/class_327;)V + METHOD (Lnet/minecraft/class_898;Lnet/minecraft/class_918;Lnet/minecraft/class_776;Lnet/minecraft/class_759;Lnet/minecraft/class_3300;Lnet/minecraft/class_5599;Lnet/minecraft/class_327;)V ARG 1 renderDispatcher ARG 2 itemRenderer - ARG 3 resourceManager - ARG 4 modelLoader - ARG 5 textRenderer METHOD method_32166 getRenderDispatcher ()Lnet/minecraft/class_898; METHOD method_32167 getPart (Lnet/minecraft/class_5601;)Lnet/minecraft/class_630; ARG 1 layer diff --git a/mappings/net/minecraft/client/render/entity/ItemFrameEntityRenderer.mapping b/mappings/net/minecraft/client/render/entity/ItemFrameEntityRenderer.mapping index 5cdacb411e..126b03111a 100644 --- a/mappings/net/minecraft/client/render/entity/ItemFrameEntityRenderer.mapping +++ b/mappings/net/minecraft/client/render/entity/ItemFrameEntityRenderer.mapping @@ -5,7 +5,6 @@ CLASS net/minecraft/class_915 net/minecraft/client/render/entity/ItemFrameEntity FIELD field_4720 itemRenderer Lnet/minecraft/class_918; FIELD field_4721 NORMAL_FRAME Lnet/minecraft/class_1091; FIELD field_4723 MAP_FRAME Lnet/minecraft/class_1091; - FIELD field_4724 client Lnet/minecraft/class_310; METHOD method_33433 getLight (Lnet/minecraft/class_1533;II)I ARG 1 itemFrame ARG 2 glowLight diff --git a/mappings/net/minecraft/client/render/entity/TntMinecartEntityRenderer.mapping b/mappings/net/minecraft/client/render/entity/TntMinecartEntityRenderer.mapping index 49d28ff33a..4b5883dd9f 100644 --- a/mappings/net/minecraft/client/render/entity/TntMinecartEntityRenderer.mapping +++ b/mappings/net/minecraft/client/render/entity/TntMinecartEntityRenderer.mapping @@ -1,10 +1,4 @@ CLASS net/minecraft/class_957 net/minecraft/client/render/entity/TntMinecartEntityRenderer - METHOD method_23190 renderFlashingBlock (Lnet/minecraft/class_2680;Lnet/minecraft/class_4587;Lnet/minecraft/class_4597;IZ)V + METHOD method_23190 renderFlashingBlock (Lnet/minecraft/class_776;Lnet/minecraft/class_2680;Lnet/minecraft/class_4587;Lnet/minecraft/class_4597;IZ)V COMMENT Renders a given block state into the given buffers either normally or with a bright white overlay. COMMENT Used for rendering primed TNT either standalone or as part of a TNT minecart. - ARG 0 blockState - ARG 1 matrices - ARG 2 vertexConsumers - ARG 3 light - ARG 4 drawFlash - COMMENT whether a white semi-transparent overlay is added to the block to indicate the flash diff --git a/mappings/net/minecraft/client/render/entity/feature/HeadFeatureRenderer.mapping b/mappings/net/minecraft/client/render/entity/feature/HeadFeatureRenderer.mapping index d00f7433fa..54feacc75f 100644 --- a/mappings/net/minecraft/client/render/entity/feature/HeadFeatureRenderer.mapping +++ b/mappings/net/minecraft/client/render/entity/feature/HeadFeatureRenderer.mapping @@ -3,15 +3,15 @@ CLASS net/minecraft/class_976 net/minecraft/client/render/entity/feature/HeadFea FIELD field_24475 scaleY F FIELD field_24476 scaleZ F FIELD field_27771 headModels Ljava/util/Map; - METHOD (Lnet/minecraft/class_3883;Lnet/minecraft/class_5599;)V - ARG 1 context - ARG 2 loader - METHOD (Lnet/minecraft/class_3883;Lnet/minecraft/class_5599;FFF)V + METHOD (Lnet/minecraft/class_3883;Lnet/minecraft/class_5599;FFFLnet/minecraft/class_759;)V ARG 1 context ARG 2 loader ARG 3 scaleX ARG 4 scaleY ARG 5 scaleZ + METHOD (Lnet/minecraft/class_3883;Lnet/minecraft/class_5599;Lnet/minecraft/class_759;)V + ARG 1 context + ARG 2 loader METHOD method_32798 translate (Lnet/minecraft/class_4587;Z)V ARG 0 matrices ARG 1 villager diff --git a/mappings/net/minecraft/client/render/entity/feature/MooshroomMushroomFeatureRenderer.mapping b/mappings/net/minecraft/client/render/entity/feature/MooshroomMushroomFeatureRenderer.mapping index 4aad8988b1..a4838117f2 100644 --- a/mappings/net/minecraft/client/render/entity/feature/MooshroomMushroomFeatureRenderer.mapping +++ b/mappings/net/minecraft/client/render/entity/feature/MooshroomMushroomFeatureRenderer.mapping @@ -1,10 +1,6 @@ CLASS net/minecraft/class_991 net/minecraft/client/render/entity/feature/MooshroomMushroomFeatureRenderer - METHOD method_37314 renderMushroom (Lnet/minecraft/class_4587;Lnet/minecraft/class_4597;IZLnet/minecraft/class_776;Lnet/minecraft/class_2680;ILnet/minecraft/class_1087;)V + METHOD method_37314 renderMushroom (Lnet/minecraft/class_4587;Lnet/minecraft/class_4597;IZLnet/minecraft/class_2680;ILnet/minecraft/class_1087;)V ARG 1 matrices ARG 2 vertexConsumers ARG 3 light ARG 4 renderAsModel - ARG 5 blockRenderManager - ARG 6 mushroomState - ARG 7 overlay - ARG 8 mushroomModel diff --git a/mappings/net/minecraft/client/render/item/HeldItemRenderer.mapping b/mappings/net/minecraft/client/render/item/HeldItemRenderer.mapping index dad581a645..c0304e98d1 100644 --- a/mappings/net/minecraft/client/render/item/HeldItemRenderer.mapping +++ b/mappings/net/minecraft/client/render/item/HeldItemRenderer.mapping @@ -33,8 +33,6 @@ CLASS net/minecraft/class_759 net/minecraft/client/render/item/HeldItemRenderer FIELD field_4051 prevEquipProgressOffHand F FIELD field_4052 equipProgressOffHand F FIELD field_4053 prevEquipProgressMainHand F - METHOD (Lnet/minecraft/class_310;)V - ARG 1 client METHOD method_22976 renderItem (FLnet/minecraft/class_4587;Lnet/minecraft/class_4597$class_4598;Lnet/minecraft/class_746;I)V ARG 1 tickDelta ARG 2 matrices diff --git a/mappings/net/minecraft/client/resource/ClientBuiltinResourcePackProvider.mapping b/mappings/net/minecraft/client/resource/ClientBuiltinResourcePackProvider.mapping index 8edaad49d1..a5660ba370 100644 --- a/mappings/net/minecraft/client/resource/ClientBuiltinResourcePackProvider.mapping +++ b/mappings/net/minecraft/client/resource/ClientBuiltinResourcePackProvider.mapping @@ -38,12 +38,11 @@ CLASS net/minecraft/class_1066 net/minecraft/client/resource/ClientBuiltinResour METHOD method_4638 loadServerPack (Ljava/io/File;Lnet/minecraft/class_5352;)Ljava/util/concurrent/CompletableFuture; ARG 1 packZip ARG 2 packSource - METHOD method_4640 download (Ljava/lang/String;Ljava/lang/String;Z)Ljava/util/concurrent/CompletableFuture; - ARG 1 url + METHOD method_4640 download (Ljava/net/URL;Ljava/lang/String;Z)Ljava/util/concurrent/CompletableFuture; ARG 2 packSha1 ARG 3 closeAfterDownload METHOD method_4641 verifyFile (Ljava/lang/String;Ljava/io/File;)Z ARG 1 expectedSha1 ARG 2 file - METHOD method_4642 clear ()V + METHOD method_4642 clear ()Ljava/util/concurrent/CompletableFuture; METHOD method_4643 deleteOldServerPack ()V diff --git a/mappings/net/minecraft/client/tutorial/FindTreeTutorialStepHandler.mapping b/mappings/net/minecraft/client/tutorial/FindTreeTutorialStepHandler.mapping index 33a4a05287..ab3d4fe0d8 100644 --- a/mappings/net/minecraft/client/tutorial/FindTreeTutorialStepHandler.mapping +++ b/mappings/net/minecraft/client/tutorial/FindTreeTutorialStepHandler.mapping @@ -4,7 +4,6 @@ CLASS net/minecraft/class_1152 net/minecraft/client/tutorial/FindTreeTutorialSte FIELD field_5629 ticks I FIELD field_5630 manager Lnet/minecraft/class_1156; FIELD field_5631 TITLE Lnet/minecraft/class_2561; - FIELD field_5632 TREE_BLOCKS Ljava/util/Set; FIELD field_5633 toast Lnet/minecraft/class_372; METHOD (Lnet/minecraft/class_1156;)V ARG 1 manager diff --git a/mappings/net/minecraft/client/util/NetworkUtils.mapping b/mappings/net/minecraft/client/util/NetworkUtils.mapping index da63a7c61a..ee71b4c801 100644 --- a/mappings/net/minecraft/client/util/NetworkUtils.mapping +++ b/mappings/net/minecraft/client/util/NetworkUtils.mapping @@ -6,9 +6,8 @@ CLASS net/minecraft/class_3521 net/minecraft/client/util/NetworkUtils COMMENT yet was retained by proguard. FIELD field_15664 EXECUTOR Lcom/google/common/util/concurrent/ListeningExecutorService; FIELD field_15665 LOGGER Lorg/slf4j/Logger; - METHOD method_15301 downloadResourcePack (Ljava/io/File;Ljava/lang/String;Ljava/util/Map;ILnet/minecraft/class_3536;Ljava/net/Proxy;)Ljava/util/concurrent/CompletableFuture; + METHOD method_15301 downloadResourcePack (Ljava/io/File;Ljava/net/URL;Ljava/util/Map;ILnet/minecraft/class_3536;Ljava/net/Proxy;)Ljava/util/concurrent/CompletableFuture; ARG 0 file - ARG 1 url ARG 2 headers ARG 3 maxFileSize ARG 4 progressListener diff --git a/mappings/net/minecraft/data/DataCache.mapping b/mappings/net/minecraft/data/DataCache.mapping index 418d391a07..fd04f63624 100644 --- a/mappings/net/minecraft/data/DataCache.mapping +++ b/mappings/net/minecraft/data/DataCache.mapping @@ -1,23 +1,6 @@ CLASS net/minecraft/class_2408 net/minecraft/data/DataCache - FIELD field_11282 oldSha1 Ljava/util/Map; - FIELD field_11283 newSha1 Ljava/util/Map; - FIELD field_11284 unchanged I FIELD field_11285 root Ljava/nio/file/Path; - FIELD field_11286 recordFile Ljava/nio/file/Path; FIELD field_11287 LOGGER Lorg/slf4j/Logger; - FIELD field_16743 ignores Ljava/util/Set; - METHOD (Ljava/nio/file/Path;Ljava/lang/String;)V + METHOD (Ljava/nio/file/Path;Ljava/util/List;Lnet/minecraft/class_6489;)V ARG 1 root - ARG 2 name - METHOD method_10323 getOldSha1 (Ljava/nio/file/Path;)Ljava/lang/String; - ARG 1 path - METHOD method_10325 updateSha1 (Ljava/nio/file/Path;Ljava/lang/String;)V - ARG 1 path - ARG 2 sha1 METHOD method_10326 write ()V - METHOD method_10328 files ()Ljava/util/stream/Stream; - METHOD method_10330 contains (Ljava/nio/file/Path;)Z - ARG 1 path - METHOD method_10331 deleteAll ()V - METHOD method_16674 ignore (Ljava/nio/file/Path;)V - ARG 1 path diff --git a/mappings/net/minecraft/data/DataGenerator.mapping b/mappings/net/minecraft/data/DataGenerator.mapping index 8a08503912..8a1ce83535 100644 --- a/mappings/net/minecraft/data/DataGenerator.mapping +++ b/mappings/net/minecraft/data/DataGenerator.mapping @@ -3,11 +3,7 @@ CLASS net/minecraft/class_2403 net/minecraft/data/DataGenerator FIELD field_11273 providers Ljava/util/List; FIELD field_11274 output Ljava/nio/file/Path; FIELD field_11275 LOGGER Lorg/slf4j/Logger; - METHOD (Ljava/nio/file/Path;Ljava/util/Collection;)V - ARG 1 output - ARG 2 inputs METHOD method_10312 getInputs ()Ljava/util/Collection; METHOD method_10313 getOutput ()Ljava/nio/file/Path; - METHOD method_10314 addProvider (Lnet/minecraft/class_2405;)V - ARG 1 provider + METHOD method_10314 addProvider (ZLnet/minecraft/class_2405;)V METHOD method_10315 run ()V diff --git a/mappings/net/minecraft/data/DataProvider.mapping b/mappings/net/minecraft/data/DataProvider.mapping index 4ae0fe3df9..69812bd970 100644 --- a/mappings/net/minecraft/data/DataProvider.mapping +++ b/mappings/net/minecraft/data/DataProvider.mapping @@ -1,10 +1,9 @@ CLASS net/minecraft/class_2405 net/minecraft/data/DataProvider FIELD field_11280 SHA1 Lcom/google/common/hash/HashFunction; - METHOD method_10319 run (Lnet/minecraft/class_2408;)V + METHOD method_10319 run (Lnet/minecraft/class_7403;)V ARG 1 cache - METHOD method_10320 writeToPath (Lcom/google/gson/Gson;Lnet/minecraft/class_2408;Lcom/google/gson/JsonElement;Ljava/nio/file/Path;)V + METHOD method_10320 writeToPath (Lcom/google/gson/Gson;Lnet/minecraft/class_7403;Lcom/google/gson/JsonElement;Ljava/nio/file/Path;)V ARG 0 gson - ARG 1 cache ARG 2 output ARG 3 path METHOD method_10321 getName ()Ljava/lang/String; diff --git a/mappings/net/minecraft/data/Main.mapping b/mappings/net/minecraft/data/Main.mapping index 16ecd52ce2..0d442a2635 100644 --- a/mappings/net/minecraft/data/Main.mapping +++ b/mappings/net/minecraft/data/Main.mapping @@ -1,7 +1,7 @@ CLASS net/minecraft/data/Main METHOD main ([Ljava/lang/String;)V ARG 0 args - METHOD method_4968 create (Ljava/nio/file/Path;Ljava/util/Collection;ZZZZZ)Lnet/minecraft/class_2403; + METHOD method_4968 create (Ljava/nio/file/Path;Ljava/util/Collection;ZZZZZLnet/minecraft/class_6489;Z)Lnet/minecraft/class_2403; ARG 0 output ARG 1 inputs ARG 2 includeClient diff --git a/mappings/net/minecraft/data/SnbtProvider.mapping b/mappings/net/minecraft/data/SnbtProvider.mapping index d44fb720e3..6bb0fc0c5a 100644 --- a/mappings/net/minecraft/data/SnbtProvider.mapping +++ b/mappings/net/minecraft/data/SnbtProvider.mapping @@ -5,7 +5,7 @@ CLASS net/minecraft/class_2463 net/minecraft/data/SnbtProvider FIELD field_24615 DEBUG_OUTPUT_DIRECTORY Ljava/nio/file/Path; METHOD (Lnet/minecraft/class_2403;)V ARG 1 generator - METHOD method_10497 write (Lnet/minecraft/class_2408;Lnet/minecraft/class_2463$class_4511;Ljava/nio/file/Path;)V + METHOD method_10497 write (Lnet/minecraft/class_7403;Lnet/minecraft/class_2463$class_4511;Ljava/nio/file/Path;)V ARG 1 cache ARG 2 data ARG 3 root diff --git a/mappings/net/minecraft/data/client/ModelProvider.mapping b/mappings/net/minecraft/data/client/ModelProvider.mapping index f489fb1dcd..8fd0e1ee9b 100644 --- a/mappings/net/minecraft/data/client/ModelProvider.mapping +++ b/mappings/net/minecraft/data/client/ModelProvider.mapping @@ -4,7 +4,7 @@ CLASS net/minecraft/class_4916 net/minecraft/data/client/ModelProvider FIELD field_22847 generator Lnet/minecraft/class_2403; METHOD (Lnet/minecraft/class_2403;)V ARG 1 generator - METHOD method_25735 writeJsons (Lnet/minecraft/class_2408;Ljava/nio/file/Path;Ljava/util/Map;Ljava/util/function/BiFunction;)V + METHOD method_25735 writeJsons (Lnet/minecraft/class_7403;Ljava/nio/file/Path;Ljava/util/Map;Ljava/util/function/BiFunction;)V ARG 1 cache ARG 2 root ARG 3 jsons diff --git a/mappings/net/minecraft/data/report/WorldgenProvider.mapping b/mappings/net/minecraft/data/report/WorldgenProvider.mapping index 3795f150f0..43a2bfc5ba 100644 --- a/mappings/net/minecraft/data/report/WorldgenProvider.mapping +++ b/mappings/net/minecraft/data/report/WorldgenProvider.mapping @@ -8,7 +8,7 @@ CLASS net/minecraft/class_5475 net/minecraft/data/report/WorldgenProvider ARG 0 root ARG 1 rootId ARG 2 id - METHOD method_39678 writeRegistryEntries (Lnet/minecraft/class_2408;Ljava/nio/file/Path;Lnet/minecraft/class_5455;Lcom/mojang/serialization/DynamicOps;Lnet/minecraft/class_5455$class_5456;)V + METHOD method_39678 writeRegistryEntries (Lnet/minecraft/class_7403;Ljava/nio/file/Path;Lnet/minecraft/class_5455;Lcom/mojang/serialization/DynamicOps;Lnet/minecraft/class_5455$class_5456;)V ARG 0 cache ARG 1 path ARG 2 registryManager @@ -16,18 +16,18 @@ CLASS net/minecraft/class_5475 net/minecraft/data/report/WorldgenProvider ARG 4 info METHOD method_39679 getRootPath (Ljava/nio/file/Path;)Ljava/nio/file/Path; ARG 0 path - METHOD method_39680 writeToPath (Ljava/nio/file/Path;Lnet/minecraft/class_2408;Lcom/mojang/serialization/DynamicOps;Lcom/mojang/serialization/Encoder;Ljava/lang/Object;)V + METHOD method_39680 writeToPath (Ljava/nio/file/Path;Lnet/minecraft/class_7403;Lcom/mojang/serialization/DynamicOps;Lcom/mojang/serialization/Encoder;Ljava/lang/Object;)V ARG 0 path ARG 1 cache ARG 2 json ARG 3 encoder ARG 4 value - METHOD method_39681 writeRegistryEntries (Ljava/nio/file/Path;Lnet/minecraft/class_2408;Lcom/mojang/serialization/DynamicOps;Lnet/minecraft/class_5321;Lnet/minecraft/class_2378;Lcom/mojang/serialization/Encoder;)V + METHOD method_39681 writeRegistryEntries (Ljava/nio/file/Path;Lnet/minecraft/class_7403;Lcom/mojang/serialization/DynamicOps;Lnet/minecraft/class_5321;Lnet/minecraft/class_2378;Lcom/mojang/serialization/Encoder;)V ARG 0 path ARG 1 cache ARG 2 json ARG 3 registryKey ARG 4 registry ARG 5 encoder - METHOD method_39682 (Lnet/minecraft/class_2408;Ljava/nio/file/Path;Lnet/minecraft/class_5455;Lcom/mojang/serialization/DynamicOps;Lnet/minecraft/class_5455$class_5456;)V + METHOD method_39682 (Lnet/minecraft/class_7403;Ljava/nio/file/Path;Lnet/minecraft/class_5455;Lcom/mojang/serialization/DynamicOps;Lnet/minecraft/class_5455$class_5456;)V ARG 4 info diff --git a/mappings/net/minecraft/data/server/AbstractTagProvider.mapping b/mappings/net/minecraft/data/server/AbstractTagProvider.mapping index 9efd58afb6..d11110f745 100644 --- a/mappings/net/minecraft/data/server/AbstractTagProvider.mapping +++ b/mappings/net/minecraft/data/server/AbstractTagProvider.mapping @@ -12,7 +12,7 @@ CLASS net/minecraft/class_2474 net/minecraft/data/server/AbstractTagProvider METHOD method_10512 getOrCreateTagBuilder (Lnet/minecraft/class_6862;)Lnet/minecraft/class_2474$class_5124; ARG 1 tag METHOD method_10514 configure ()V - METHOD method_27046 (Lnet/minecraft/class_2408;Lnet/minecraft/class_2960;Lnet/minecraft/class_3494$class_3495;)V + METHOD method_27046 (Lnet/minecraft/class_7403;Lnet/minecraft/class_2960;Lnet/minecraft/class_3494$class_3495;)V ARG 2 id ARG 3 builder METHOD method_27169 getTagBuilder (Lnet/minecraft/class_6862;)Lnet/minecraft/class_3494$class_3495; diff --git a/mappings/net/minecraft/data/server/AdvancementProvider.mapping b/mappings/net/minecraft/data/server/AdvancementProvider.mapping index 1c4f3b415d..ac12055d5b 100644 --- a/mappings/net/minecraft/data/server/AdvancementProvider.mapping +++ b/mappings/net/minecraft/data/server/AdvancementProvider.mapping @@ -5,7 +5,7 @@ CLASS net/minecraft/class_2409 net/minecraft/data/server/AdvancementProvider FIELD field_11291 GSON Lcom/google/gson/Gson; METHOD (Lnet/minecraft/class_2403;)V ARG 1 root - METHOD method_10333 (Ljava/util/Set;Ljava/nio/file/Path;Lnet/minecraft/class_2408;Lnet/minecraft/class_161;)V + METHOD method_10333 (Ljava/util/Set;Ljava/nio/file/Path;Lnet/minecraft/class_7403;Lnet/minecraft/class_161;)V ARG 3 advancement METHOD method_10334 getOutput (Ljava/nio/file/Path;Lnet/minecraft/class_161;)Ljava/nio/file/Path; ARG 0 rootOutput diff --git a/mappings/net/minecraft/data/server/LootTableProvider.mapping b/mappings/net/minecraft/data/server/LootTableProvider.mapping index d6fd5ca5e8..498feecc16 100644 --- a/mappings/net/minecraft/data/server/LootTableProvider.mapping +++ b/mappings/net/minecraft/data/server/LootTableProvider.mapping @@ -8,7 +8,7 @@ CLASS net/minecraft/class_2438 net/minecraft/data/server/LootTableProvider METHOD method_10407 (Ljava/lang/String;Ljava/lang/String;)V ARG 0 name ARG 1 message - METHOD method_10408 (Ljava/nio/file/Path;Lnet/minecraft/class_2408;Lnet/minecraft/class_2960;Lnet/minecraft/class_52;)V + METHOD method_10408 (Ljava/nio/file/Path;Lnet/minecraft/class_7403;Lnet/minecraft/class_2960;Lnet/minecraft/class_52;)V ARG 2 id ARG 3 table METHOD method_10409 getOutput (Ljava/nio/file/Path;Lnet/minecraft/class_2960;)Ljava/nio/file/Path; diff --git a/mappings/net/minecraft/data/server/RecipeProvider.mapping b/mappings/net/minecraft/data/server/RecipeProvider.mapping index ea05295c32..3e34b10c33 100644 --- a/mappings/net/minecraft/data/server/RecipeProvider.mapping +++ b/mappings/net/minecraft/data/server/RecipeProvider.mapping @@ -17,19 +17,19 @@ CLASS net/minecraft/class_2446 net/minecraft/data/server/RecipeProvider ARG 0 exporter METHOD method_10420 conditionsFromTag (Lnet/minecraft/class_6862;)Lnet/minecraft/class_2066$class_2068; ARG 0 tag - METHOD method_10421 (Ljava/util/Set;Lnet/minecraft/class_2408;Ljava/nio/file/Path;Lnet/minecraft/class_2444;)V + METHOD method_10421 (Ljava/util/Set;Lnet/minecraft/class_7403;Ljava/nio/file/Path;Lnet/minecraft/class_2444;)V ARG 3 provider METHOD method_10422 requireEnteringFluid (Lnet/minecraft/class_2248;)Lnet/minecraft/class_2037$class_2039; ARG 0 block METHOD method_10423 conditionsFromItemPredicates ([Lnet/minecraft/class_2073;)Lnet/minecraft/class_2066$class_2068; ARG 0 predicates - METHOD method_10425 saveRecipe (Lnet/minecraft/class_2408;Lcom/google/gson/JsonObject;Ljava/nio/file/Path;)V + METHOD method_10425 saveRecipe (Lnet/minecraft/class_7403;Lcom/google/gson/JsonObject;Ljava/nio/file/Path;)V ARG 0 cache ARG 1 json ARG 2 path METHOD method_10426 conditionsFromItem (Lnet/minecraft/class_1935;)Lnet/minecraft/class_2066$class_2068; ARG 0 item - METHOD method_10427 saveRecipeAdvancement (Lnet/minecraft/class_2408;Lcom/google/gson/JsonObject;Ljava/nio/file/Path;)V + METHOD method_10427 saveRecipeAdvancement (Lnet/minecraft/class_7403;Lcom/google/gson/JsonObject;Ljava/nio/file/Path;)V ARG 0 cache ARG 1 json ARG 2 path diff --git a/mappings/net/minecraft/datafixer/fix/BlendingDataFix.mapping b/mappings/net/minecraft/datafixer/fix/BlendingDataFix.mapping index 04e08b8367..9696f1eb1d 100644 --- a/mappings/net/minecraft/datafixer/fix/BlendingDataFix.mapping +++ b/mappings/net/minecraft/datafixer/fix/BlendingDataFix.mapping @@ -1,5 +1,4 @@ CLASS net/minecraft/class_7090 net/minecraft/datafixer/fix/BlendingDataFix FIELD field_37414 name Ljava/lang/String; - METHOD (Lcom/mojang/datafixers/schemas/Schema;Ljava/lang/String;)V + METHOD (Lcom/mojang/datafixers/schemas/Schema;)V ARG 1 schema - ARG 2 name diff --git a/mappings/net/minecraft/entity/ai/brain/task/UpdateAttackTargetTask.mapping b/mappings/net/minecraft/entity/ai/brain/task/UpdateAttackTargetTask.mapping index 28aa3c8690..732ff5a1d4 100644 --- a/mappings/net/minecraft/entity/ai/brain/task/UpdateAttackTargetTask.mapping +++ b/mappings/net/minecraft/entity/ai/brain/task/UpdateAttackTargetTask.mapping @@ -13,7 +13,3 @@ CLASS net/minecraft/class_4824 net/minecraft/entity/ai/brain/task/UpdateAttackTa METHOD method_24611 (Lnet/minecraft/class_1308;)Z ARG 0 entity METHOD method_24612 updateAttackTarget (Lnet/minecraft/class_1308;Lnet/minecraft/class_1309;)V - ARG 1 entity - ARG 2 target - METHOD method_24615 (Lnet/minecraft/class_1308;Lnet/minecraft/class_1309;)V - ARG 2 target diff --git a/mappings/net/minecraft/entity/ai/brain/task/UpdateRoarTargetTask.mapping b/mappings/net/minecraft/entity/ai/brain/task/UpdateRoarTargetTask.mapping deleted file mode 100644 index 2aaacd7481..0000000000 --- a/mappings/net/minecraft/entity/ai/brain/task/UpdateRoarTargetTask.mapping +++ /dev/null @@ -1,5 +0,0 @@ -CLASS net/minecraft/class_7258 net/minecraft/entity/ai/brain/task/UpdateRoarTargetTask - METHOD method_42200 runAndForget (Lnet/minecraft/class_3218;Lnet/minecraft/class_7260;J)V - ARG 1 world - ARG 2 warden - ARG 3 time diff --git a/mappings/net/minecraft/entity/boss/dragon/EnderDragonFight.mapping b/mappings/net/minecraft/entity/boss/dragon/EnderDragonFight.mapping index 46241e25d4..8e87d85aa0 100644 --- a/mappings/net/minecraft/entity/boss/dragon/EnderDragonFight.mapping +++ b/mappings/net/minecraft/entity/boss/dragon/EnderDragonFight.mapping @@ -15,7 +15,7 @@ CLASS net/minecraft/class_2881 net/minecraft/entity/boss/dragon/EnderDragonFight FIELD field_13118 spawnStateTimer I FIELD field_13119 bossBar Lnet/minecraft/class_3213; FIELD field_13120 dragonSpawnState Lnet/minecraft/class_2876; - FIELD field_13121 gateways Ljava/util/List; + FIELD field_13121 gateways Lit/unimi/dsi/fastutil/objects/ObjectArrayList; FIELD field_13122 playerUpdateTimer I FIELD field_31442 SPAWN_Y I FIELD field_31443 CHECK_DRAGON_SEEN_INTERVAL I diff --git a/mappings/net/minecraft/entity/decoration/ItemFrameEntity.mapping b/mappings/net/minecraft/entity/decoration/ItemFrameEntity.mapping index 52c00017b7..7fca23900c 100644 --- a/mappings/net/minecraft/entity/decoration/ItemFrameEntity.mapping +++ b/mappings/net/minecraft/entity/decoration/ItemFrameEntity.mapping @@ -29,7 +29,6 @@ CLASS net/minecraft/class_1533 net/minecraft/entity/decoration/ItemFrameEntity ARG 1 entity ARG 2 alwaysDrop METHOD method_6937 removeFromFrame (Lnet/minecraft/class_1799;)V - ARG 1 map METHOD method_6938 getComparatorPower ()I METHOD method_6939 setRotation (I)V ARG 1 value diff --git a/mappings/net/minecraft/entity/effect/StatusEffectInstance.mapping b/mappings/net/minecraft/entity/effect/StatusEffectInstance.mapping index 830f8c6873..be3984ae8a 100644 --- a/mappings/net/minecraft/entity/effect/StatusEffectInstance.mapping +++ b/mappings/net/minecraft/entity/effect/StatusEffectInstance.mapping @@ -14,8 +14,6 @@ CLASS net/minecraft/class_1293 net/minecraft/entity/effect/StatusEffectInstance FIELD field_5895 duration I FIELD field_5896 type Lnet/minecraft/class_1291; FIELD field_5897 LOGGER Lorg/slf4j/Logger; - METHOD (Lnet/minecraft/class_1291;)V - ARG 1 type METHOD (Lnet/minecraft/class_1291;I)V ARG 1 type ARG 2 duration @@ -45,8 +43,6 @@ CLASS net/minecraft/class_1293 net/minecraft/entity/effect/StatusEffectInstance ARG 6 showIcon ARG 7 hiddenEffect ARG 8 factorCalculationData - METHOD (Lnet/minecraft/class_1293;)V - ARG 1 instance METHOD compareTo (Ljava/lang/Object;)I ARG 1 that METHOD equals (Ljava/lang/Object;)Z diff --git a/mappings/net/minecraft/entity/mob/MobEntity.mapping b/mappings/net/minecraft/entity/mob/MobEntity.mapping index b414cdab0b..80aea32205 100644 --- a/mappings/net/minecraft/entity/mob/MobEntity.mapping +++ b/mappings/net/minecraft/entity/mob/MobEntity.mapping @@ -127,11 +127,8 @@ CLASS net/minecraft/class_1308 net/minecraft/entity/mob/MobEntity METHOD method_29506 interactWithItem (Lnet/minecraft/class_1657;Lnet/minecraft/class_1268;)Lnet/minecraft/class_1269; ARG 1 player ARG 2 hand - METHOD method_30758 enchantEquipment (FLnet/minecraft/class_1304;)V - ARG 1 power - ARG 2 slot - METHOD method_30759 enchantMainHandItem (F)V - ARG 1 power + METHOD method_30758 enchantEquipment (Lnet/minecraft/class_5819;FLnet/minecraft/class_1304;)V + METHOD method_30759 enchantMainHandItem (Lnet/minecraft/class_5819;F)V METHOD method_33191 squaredAttackRange (Lnet/minecraft/class_1309;)D ARG 1 target METHOD method_35055 clearPositionTarget ()V @@ -209,8 +206,7 @@ CLASS net/minecraft/class_1308 net/minecraft/entity/mob/MobEntity METHOD method_5961 isLeftHanded ()Z METHOD method_5962 getMoveControl ()Lnet/minecraft/class_1335; METHOD method_5963 createBodyControl ()Lnet/minecraft/class_1330; - METHOD method_5964 initEquipment (Lnet/minecraft/class_1266;)V - ARG 1 difficulty + METHOD method_5964 initEquipment (Lnet/minecraft/class_5819;Lnet/minecraft/class_1266;)V METHOD method_5965 createNavigation (Lnet/minecraft/class_1937;)Lnet/minecraft/class_1408; ARG 1 world METHOD method_5966 playAmbientSound ()V @@ -241,8 +237,7 @@ CLASS net/minecraft/class_1308 net/minecraft/entity/mob/MobEntity METHOD method_5980 setTarget (Lnet/minecraft/class_1309;)V ARG 1 target METHOD method_5983 onEatingGrass ()V - METHOD method_5984 updateEnchantments (Lnet/minecraft/class_1266;)V - ARG 1 difficulty + METHOD method_5984 updateEnchantments (Lnet/minecraft/class_5819;Lnet/minecraft/class_1266;)V METHOD method_5985 getVisibilityCache ()Lnet/minecraft/class_1413; METHOD method_5986 getMaxHeadRotation ()I COMMENT {@return the maximum degrees which the head yaw can differ from the body yaw} diff --git a/mappings/net/minecraft/entity/mob/PiglinBrain.mapping b/mappings/net/minecraft/entity/mob/PiglinBrain.mapping index 36636cfc6f..bf005ae4db 100644 --- a/mappings/net/minecraft/entity/mob/PiglinBrain.mapping +++ b/mappings/net/minecraft/entity/mob/PiglinBrain.mapping @@ -52,8 +52,7 @@ CLASS net/minecraft/class_4838 net/minecraft/entity/mob/PiglinBrain ARG 1 piglin METHOD method_24735 isGoldenItem (Lnet/minecraft/class_1799;)Z ARG 0 stack - METHOD method_24736 setHuntedRecently (Lnet/minecraft/class_4836;)V - ARG 0 piglin + METHOD method_24736 setHuntedRecently (Lnet/minecraft/class_4836;Lnet/minecraft/class_5819;)V METHOD method_24737 makeRememberRideableHoglinTask ()Lnet/minecraft/class_4821; METHOD method_24738 makeGoToSoulFireTask ()Lnet/minecraft/class_4121; METHOD method_24739 isGoldHoldingPlayer (Lnet/minecraft/class_1309;)Z diff --git a/mappings/net/minecraft/entity/mob/PiglinEntity.mapping b/mappings/net/minecraft/entity/mob/PiglinEntity.mapping index 776c0bca7e..fb534aace9 100644 --- a/mappings/net/minecraft/entity/mob/PiglinEntity.mapping +++ b/mappings/net/minecraft/entity/mob/PiglinEntity.mapping @@ -14,7 +14,7 @@ CLASS net/minecraft/class_4836 net/minecraft/entity/mob/PiglinEntity ARG 2 spawnReason ARG 3 pos ARG 4 random - METHOD method_24696 equipAtChance (Lnet/minecraft/class_1304;Lnet/minecraft/class_1799;)V + METHOD method_24696 equipAtChance (Lnet/minecraft/class_1304;Lnet/minecraft/class_1799;Lnet/minecraft/class_5819;)V ARG 1 slot ARG 2 stack METHOD method_24702 makeInitialWeapon ()Lnet/minecraft/class_1799; diff --git a/mappings/net/minecraft/entity/mob/WardenBrain.mapping b/mappings/net/minecraft/entity/mob/WardenBrain.mapping index 1c0100e0f1..3c971b40de 100644 --- a/mappings/net/minecraft/entity/mob/WardenBrain.mapping +++ b/mappings/net/minecraft/entity/mob/WardenBrain.mapping @@ -36,8 +36,6 @@ CLASS net/minecraft/class_7261 net/minecraft/entity/mob/WardenBrain ARG 1 brain METHOD method_42237 addDigActivities (Lnet/minecraft/class_4095;)V ARG 0 brain - METHOD method_42238 (Lnet/minecraft/class_7260;)Z - ARG 0 warden METHOD method_42240 addIdleActivities (Lnet/minecraft/class_4095;)V ARG 0 brain METHOD method_42241 (Lnet/minecraft/class_7260;Lnet/minecraft/class_1309;)Z diff --git a/mappings/net/minecraft/entity/passive/CatEntity.mapping b/mappings/net/minecraft/entity/passive/CatEntity.mapping index c290eb9e35..5319817cdf 100644 --- a/mappings/net/minecraft/entity/passive/CatEntity.mapping +++ b/mappings/net/minecraft/entity/passive/CatEntity.mapping @@ -43,7 +43,7 @@ CLASS net/minecraft/class_1451 net/minecraft/entity/passive/CatEntity METHOD method_26881 createCatAttributes ()Lnet/minecraft/class_5132$class_5133; METHOD method_43088 (Lnet/minecraft/class_6880;)V ARG 1 variant - METHOD method_43089 (Lnet/minecraft/class_6885$class_6888;)Ljava/util/Optional; + METHOD method_43089 (Lnet/minecraft/class_5425;Lnet/minecraft/class_6885$class_6888;)Ljava/util/Optional; ARG 1 list METHOD method_6571 getVariant ()Lnet/minecraft/class_7375; METHOD method_6572 setVariant (Lnet/minecraft/class_7375;)V diff --git a/mappings/net/minecraft/entity/passive/FrogBrain.mapping b/mappings/net/minecraft/entity/passive/FrogBrain.mapping index df692104cf..c511ec8da3 100644 --- a/mappings/net/minecraft/entity/passive/FrogBrain.mapping +++ b/mappings/net/minecraft/entity/passive/FrogBrain.mapping @@ -5,8 +5,7 @@ CLASS net/minecraft/class_7107 net/minecraft/entity/passive/FrogBrain ARG 0 frog METHOD method_41368 create (Lnet/minecraft/class_4095;)Lnet/minecraft/class_4095; ARG 0 brain - METHOD method_41369 coolDownLongJump (Lnet/minecraft/class_7102;)V - ARG 0 frog + METHOD method_41369 coolDownLongJump (Lnet/minecraft/class_7102;Lnet/minecraft/class_5819;)V METHOD method_41370 (Lnet/minecraft/class_2680;)Z ARG 0 state METHOD method_41371 (Lnet/minecraft/class_1309;)Ljava/lang/Float; diff --git a/mappings/net/minecraft/entity/passive/GoatBrain.mapping b/mappings/net/minecraft/entity/passive/GoatBrain.mapping index 179aa83eec..60f47cc661 100644 --- a/mappings/net/minecraft/entity/passive/GoatBrain.mapping +++ b/mappings/net/minecraft/entity/passive/GoatBrain.mapping @@ -24,8 +24,7 @@ CLASS net/minecraft/class_6054 net/minecraft/entity/passive/GoatBrain ARG 0 goat METHOD method_35183 create (Lnet/minecraft/class_4095;)Lnet/minecraft/class_4095; ARG 0 brain - METHOD method_35184 resetLongJumpCooldown (Lnet/minecraft/class_6053;)V - ARG 0 goat + METHOD method_35184 resetLongJumpCooldown (Lnet/minecraft/class_6053;Lnet/minecraft/class_5819;)V METHOD method_35185 addCoreActivities (Lnet/minecraft/class_4095;)V ARG 0 brain METHOD method_35186 updateActivities (Lnet/minecraft/class_6053;)V diff --git a/mappings/net/minecraft/entity/passive/HorseBaseEntity.mapping b/mappings/net/minecraft/entity/passive/HorseBaseEntity.mapping index e5eeae2aa0..559949ab4e 100644 --- a/mappings/net/minecraft/entity/passive/HorseBaseEntity.mapping +++ b/mappings/net/minecraft/entity/passive/HorseBaseEntity.mapping @@ -44,7 +44,7 @@ CLASS net/minecraft/class_1496 net/minecraft/entity/passive/HorseBaseEntity ARG 0 stack METHOD method_33338 areInventoriesDifferent (Lnet/minecraft/class_1263;)Z ARG 1 inventory - METHOD method_6001 initAttributes ()V + METHOD method_6001 initAttributes (Lnet/minecraft/class_5819;)V METHOD method_6721 onChestedStatusChanged ()V METHOD method_6722 (Lnet/minecraft/class_1657;)V ARG 1 player @@ -53,7 +53,7 @@ CLASS net/minecraft/class_1496 net/minecraft/entity/passive/HorseBaseEntity METHOD method_6726 putPlayerOnBack (Lnet/minecraft/class_1657;)V ARG 1 player METHOD method_6727 isTame ()Z - METHOD method_6728 getChildMovementSpeedBonus ()D + METHOD method_6728 getChildMovementSpeedBonus (Lnet/minecraft/class_5819;)D METHOD method_6729 getTemper ()I METHOD method_6730 getHorseFlag (I)Z ARG 1 bitmask @@ -105,7 +105,7 @@ CLASS net/minecraft/class_1496 net/minecraft/entity/passive/HorseBaseEntity COMMENT Whether this horse already has an item stack in its horse armor slot. COMMENT COMMENT @see #hasArmorSlot() - METHOD method_6754 getChildHealthBonus ()F + METHOD method_6754 getChildHealthBonus (Lnet/minecraft/class_5819;)F METHOD method_6755 getMaxTemper ()I METHOD method_6757 playAngrySound ()V METHOD method_6758 setInAir (Z)V @@ -134,4 +134,4 @@ CLASS net/minecraft/class_1496 net/minecraft/entity/passive/HorseBaseEntity COMMENT COMMENT @see #hasArmorSlot() ARG 1 item - METHOD method_6774 getChildJumpStrengthBonus ()D + METHOD method_6774 getChildJumpStrengthBonus (Lnet/minecraft/class_5819;)D diff --git a/mappings/net/minecraft/entity/passive/LlamaEntity.mapping b/mappings/net/minecraft/entity/passive/LlamaEntity.mapping index cb9875a77b..8297a3d55f 100644 --- a/mappings/net/minecraft/entity/passive/LlamaEntity.mapping +++ b/mappings/net/minecraft/entity/passive/LlamaEntity.mapping @@ -17,7 +17,7 @@ CLASS net/minecraft/class_1501 net/minecraft/entity/passive/LlamaEntity METHOD method_6793 hasFollower ()Z METHOD method_6794 getColorFromCarpet (Lnet/minecraft/class_1799;)Lnet/minecraft/class_1767; ARG 0 color - METHOD method_6796 initializeStrength ()V + METHOD method_6796 initializeStrength (Lnet/minecraft/class_5819;)V METHOD method_6797 stopFollowing ()V METHOD method_6798 setVariant (I)V ARG 1 variant diff --git a/mappings/net/minecraft/entity/player/PlayerEntity.mapping b/mappings/net/minecraft/entity/player/PlayerEntity.mapping index 4c9810b316..00cc5f1b84 100644 --- a/mappings/net/minecraft/entity/player/PlayerEntity.mapping +++ b/mappings/net/minecraft/entity/player/PlayerEntity.mapping @@ -2,7 +2,6 @@ CLASS net/minecraft/class_1657 net/minecraft/entity/player/PlayerEntity FIELD field_18134 POSE_DIMENSIONS Ljava/util/Map; FIELD field_18135 STANDING_DIMENSIONS Lnet/minecraft/class_4048; FIELD field_19428 shoulderEntityAddedTime J - FIELD field_30642 OFFLINE_PLAYER_UUID_PREFIX Ljava/lang/String; FIELD field_38198 sculkShriekerWarningManager Lnet/minecraft/class_7262; FIELD field_38745 LAST_DEATH_POS Lnet/minecraft/class_2940; FIELD field_7483 strideDistance F @@ -151,8 +150,6 @@ CLASS net/minecraft/class_1657 net/minecraft/entity/player/PlayerEntity COMMENT the position of the bed block METHOD method_7270 giveItemStack (Lnet/minecraft/class_1799;)Z ARG 1 stack - METHOD method_7271 getUuidFromProfile (Lcom/mojang/authlib/GameProfile;)Ljava/util/UUID; - ARG 0 profile METHOD method_7272 getScore ()I METHOD method_7273 setShoulderEntityLeft (Lnet/minecraft/class_2487;)V ARG 1 entityNbt @@ -210,8 +207,6 @@ CLASS net/minecraft/class_1657 net/minecraft/entity/player/PlayerEntity COMMENT @see net.minecraft.item.Item#isSuitableFor(BlockState) ARG 1 state METHOD method_7308 getShoulderEntityRight ()Lnet/minecraft/class_2487; - METHOD method_7310 getOfflinePlayerUuid (Ljava/lang/String;)Ljava/util/UUID; - ARG 0 nickname METHOD method_7311 openEditSignScreen (Lnet/minecraft/class_2625;)V ARG 1 sign METHOD method_7313 updateCapeAngles ()V diff --git a/mappings/net/minecraft/loot/LootTable.mapping b/mappings/net/minecraft/loot/LootTable.mapping index 8c33c0dc83..28eba2027a 100644 --- a/mappings/net/minecraft/loot/LootTable.mapping +++ b/mappings/net/minecraft/loot/LootTable.mapping @@ -10,7 +10,7 @@ CLASS net/minecraft/class_52 net/minecraft/loot/LootTable ARG 1 type ARG 2 pools ARG 3 functions - METHOD method_319 generateLoot (Lnet/minecraft/class_47;)Ljava/util/List; + METHOD method_319 generateLoot (Lnet/minecraft/class_47;)Lit/unimi/dsi/fastutil/objects/ObjectArrayList; ARG 1 context METHOD method_320 generateLoot (Lnet/minecraft/class_47;Ljava/util/function/Consumer;)V ARG 1 context @@ -32,8 +32,7 @@ CLASS net/minecraft/class_52 net/minecraft/loot/LootTable ARG 1 stack METHOD method_332 processStacks (Ljava/util/function/Consumer;)Ljava/util/function/Consumer; ARG 0 lootConsumer - METHOD method_333 shuffle (Ljava/util/List;ILnet/minecraft/class_5819;)V - ARG 1 drops + METHOD method_333 shuffle (Lit/unimi/dsi/fastutil/objects/ObjectArrayList;ILnet/minecraft/class_5819;)V ARG 2 freeSlots ARG 3 random CLASS class_53 Builder diff --git a/mappings/net/minecraft/network/packet/c2s/play/UpdateBeaconC2SPacket.mapping b/mappings/net/minecraft/network/packet/c2s/play/UpdateBeaconC2SPacket.mapping index 3cfc832f5d..8b9278cd0f 100644 --- a/mappings/net/minecraft/network/packet/c2s/play/UpdateBeaconC2SPacket.mapping +++ b/mappings/net/minecraft/network/packet/c2s/play/UpdateBeaconC2SPacket.mapping @@ -1,7 +1,7 @@ CLASS net/minecraft/class_2866 net/minecraft/network/packet/c2s/play/UpdateBeaconC2SPacket - FIELD field_13049 secondaryEffectId Lnet/minecraft/class_1291; - FIELD field_13050 primaryEffectId Lnet/minecraft/class_1291; + FIELD field_13049 secondaryEffectId Ljava/util/Optional; + FIELD field_13050 primaryEffectId Ljava/util/Optional; METHOD (Lnet/minecraft/class_2540;)V ARG 1 buf - METHOD method_12435 getSecondaryEffectId ()Lnet/minecraft/class_1291; - METHOD method_12436 getPrimaryEffectId ()Lnet/minecraft/class_1291; + METHOD method_12435 getSecondaryEffectId ()Ljava/util/Optional; + METHOD method_12436 getPrimaryEffectId ()Ljava/util/Optional; diff --git a/mappings/net/minecraft/screen/BeaconScreenHandler.mapping b/mappings/net/minecraft/screen/BeaconScreenHandler.mapping index ed20e2502b..fa93f5a56e 100644 --- a/mappings/net/minecraft/screen/BeaconScreenHandler.mapping +++ b/mappings/net/minecraft/screen/BeaconScreenHandler.mapping @@ -11,7 +11,7 @@ CLASS net/minecraft/class_1704 net/minecraft/screen/BeaconScreenHandler ARG 2 inventory ARG 3 propertyDelegate ARG 4 context - METHOD method_17372 setEffects (Lnet/minecraft/class_1291;Lnet/minecraft/class_1291;)V + METHOD method_17372 setEffects (Ljava/util/Optional;Ljava/util/Optional;)V METHOD method_17373 getProperties ()I METHOD method_17374 getPrimaryEffect ()Lnet/minecraft/class_1291; METHOD method_17375 getSecondaryEffect ()Lnet/minecraft/class_1291; diff --git a/mappings/net/minecraft/server/MinecraftServer.mapping b/mappings/net/minecraft/server/MinecraftServer.mapping index c62e5ff503..7e6be13b3e 100644 --- a/mappings/net/minecraft/server/MinecraftServer.mapping +++ b/mappings/net/minecraft/server/MinecraftServer.mapping @@ -33,9 +33,6 @@ CLASS net/minecraft/server/MinecraftServer FIELD field_25132 registryManager Lnet/minecraft/class_5455$class_6890; FIELD field_25318 resourceManagerHolder Lnet/minecraft/server/MinecraftServer$class_6897; FIELD field_33205 MILLISECONDS_PER_TICK J - FIELD field_33207 LEVEL_PROTOCOL_NAME Ljava/lang/String; - FIELD field_33208 LEVEL_PROTOCOL Ljava/lang/String; - FIELD field_33209 RESOURCES_ZIP_FILE_NAME Ljava/lang/String; FIELD field_33210 START_TICKET_CHUNK_RADIUS I FIELD field_33211 MAX_WORLD_BORDER_RADIUS I FIELD field_33217 PLAYER_SAMPLE_UPDATE_INTERVAL J @@ -409,7 +406,6 @@ CLASS net/minecraft/server/MinecraftServer METHOD method_3859 addExtraSystemDetails (Lnet/minecraft/class_6396;)Lnet/minecraft/class_6396; ARG 1 details METHOD method_3860 isRemote ()Z - METHOD method_3861 loadWorldResourcePack ()V METHOD method_3862 getPlayerIdleTimeout ()I METHOD method_3864 setOnlineMode (Z)V COMMENT Sets whether this server is in the online mode, or whether it diff --git a/mappings/net/minecraft/structure/Structure.mapping b/mappings/net/minecraft/structure/Structure.mapping index dea005d625..698fbea9f7 100644 --- a/mappings/net/minecraft/structure/Structure.mapping +++ b/mappings/net/minecraft/structure/Structure.mapping @@ -29,7 +29,7 @@ CLASS net/minecraft/class_3499 net/minecraft/structure/Structure ARG 1 world ARG 2 firstCorner ARG 3 secondCorner - METHOD method_15165 getInfosForBlock (Lnet/minecraft/class_2338;Lnet/minecraft/class_3492;Lnet/minecraft/class_2248;Z)Ljava/util/List; + METHOD method_15165 getInfosForBlock (Lnet/minecraft/class_2338;Lnet/minecraft/class_3492;Lnet/minecraft/class_2248;Z)Lit/unimi/dsi/fastutil/objects/ObjectArrayList; ARG 1 pos ARG 2 placementData ARG 3 block diff --git a/mappings/net/minecraft/structure/pool/StructurePool.mapping b/mappings/net/minecraft/structure/pool/StructurePool.mapping index 7be9b50d9a..1e8455b5fa 100644 --- a/mappings/net/minecraft/structure/pool/StructurePool.mapping +++ b/mappings/net/minecraft/structure/pool/StructurePool.mapping @@ -1,6 +1,6 @@ CLASS net/minecraft/class_3785 net/minecraft/structure/pool/StructurePool FIELD field_16678 id Lnet/minecraft/class_2960; - FIELD field_16680 elements Ljava/util/List; + FIELD field_16680 elements Lit/unimi/dsi/fastutil/objects/ObjectArrayList; FIELD field_16681 terminatorsId Lnet/minecraft/class_2960; FIELD field_16864 elementCounts Ljava/util/List; FIELD field_18707 highestY I diff --git a/mappings/net/minecraft/util/Util.mapping b/mappings/net/minecraft/util/Util.mapping index 44d04f4c2e..02b8151a63 100644 --- a/mappings/net/minecraft/util/Util.mapping +++ b/mappings/net/minecraft/util/Util.mapping @@ -170,11 +170,9 @@ CLASS net/minecraft/class_156 net/minecraft/util/Util METHOD method_41238 debugSupplier (Ljava/util/function/Supplier;Ljava/util/function/Supplier;)Ljava/util/function/Supplier; ARG 0 supplier ARG 1 messageSupplier - METHOD method_43027 copyShuffled (Ljava/util/List;Lnet/minecraft/class_5819;)Ljava/util/List; - ARG 0 list + METHOD method_43027 copyShuffled (Lit/unimi/dsi/fastutil/objects/ObjectArrayList;Lnet/minecraft/class_5819;)Ljava/util/List; ARG 1 random - METHOD method_43028 shuffle (Ljava/util/List;Lnet/minecraft/class_5819;)V - ARG 0 list + METHOD method_43028 shuffle (Lit/unimi/dsi/fastutil/objects/ObjectArrayList;Lnet/minecraft/class_5819;)V ARG 1 random METHOD method_645 previous (Ljava/lang/Iterable;Ljava/lang/Object;)Ljava/lang/Object; ARG 0 iterable diff --git a/mappings/net/minecraft/world/MobSpawnerLogic.mapping b/mappings/net/minecraft/world/MobSpawnerLogic.mapping index 6b590da26f..86e087ac85 100644 --- a/mappings/net/minecraft/world/MobSpawnerLogic.mapping +++ b/mappings/net/minecraft/world/MobSpawnerLogic.mapping @@ -1,5 +1,4 @@ CLASS net/minecraft/class_1917 net/minecraft/world/MobSpawnerLogic - FIELD field_27080 random Lnet/minecraft/class_5819; FIELD field_9149 spawnCount I FIELD field_9150 maxSpawnDelay I FIELD field_9151 minSpawnDelay I diff --git a/mappings/net/minecraft/world/World.mapping b/mappings/net/minecraft/world/World.mapping index 66b1427503..79f300fcf9 100644 --- a/mappings/net/minecraft/world/World.mapping +++ b/mappings/net/minecraft/world/World.mapping @@ -35,7 +35,6 @@ CLASS net/minecraft/class_1937 net/minecraft/world/World ARG 1 properties ARG 2 registryRef ARG 3 dimension - ARG 4 profiler ARG 5 isClient ARG 6 debugWorld ARG 7 seed diff --git a/mappings/net/minecraft/world/WorldAccess.mapping b/mappings/net/minecraft/world/WorldAccess.mapping index df27fa416b..1402187c2b 100644 --- a/mappings/net/minecraft/world/WorldAccess.mapping +++ b/mappings/net/minecraft/world/WorldAccess.mapping @@ -3,18 +3,9 @@ CLASS net/minecraft/class_1936 net/minecraft/world/WorldAccess ARG 1 eventId ARG 2 pos ARG 3 data - METHOD method_32888 emitGameEvent (Lnet/minecraft/class_1297;Lnet/minecraft/class_5712;Lnet/minecraft/class_243;)V + METHOD method_32888 emitGameEvent (Lnet/minecraft/class_5712;Lnet/minecraft/class_243;Lnet/minecraft/class_5712$class_7397;)V COMMENT Emits an game event. - ARG 1 entity - COMMENT the entity that triggered the game event, or {@code null} for events - COMMENT not triggered by entities (such as dispensers) - ARG 2 event - COMMENT the game event - ARG 3 pos METHOD method_33596 emitGameEvent (Lnet/minecraft/class_1297;Lnet/minecraft/class_5712;Lnet/minecraft/class_2338;)V - ARG 1 entity - ARG 2 event - ARG 3 pos METHOD method_39224 getTickOrder ()J METHOD method_39279 createAndScheduleBlockTick (Lnet/minecraft/class_2338;Lnet/minecraft/class_2248;I)V ARG 1 pos diff --git a/mappings/net/minecraft/world/event/listener/GameEventDispatcher.mapping b/mappings/net/minecraft/world/event/listener/GameEventDispatcher.mapping index cd99f57791..4523314626 100644 --- a/mappings/net/minecraft/world/event/listener/GameEventDispatcher.mapping +++ b/mappings/net/minecraft/world/event/listener/GameEventDispatcher.mapping @@ -4,13 +4,10 @@ CLASS net/minecraft/class_5713 net/minecraft/world/event/listener/GameEventDispa COMMENT An unmodifiable, empty (non-operative) dispatcher. METHOD method_32942 isEmpty ()Z COMMENT Returns whether this dispatcher has no listeners. - METHOD method_32943 dispatch (Lnet/minecraft/class_5712;Lnet/minecraft/class_1297;Lnet/minecraft/class_243;)V + METHOD method_32943 dispatch (Lnet/minecraft/class_5712;Lnet/minecraft/class_243;Lnet/minecraft/class_5712$class_7397;)V COMMENT Dispatches an event to all the listeners in this dispatcher. ARG 1 event COMMENT the event - ARG 2 entity - COMMENT an entity related to the event - ARG 3 pos METHOD method_32944 addListener (Lnet/minecraft/class_5714;)V COMMENT Adds a listener to this dispatcher. ARG 1 listener diff --git a/mappings/net/minecraft/world/event/listener/GameEventListener.mapping b/mappings/net/minecraft/world/event/listener/GameEventListener.mapping index 9a3ce62a0a..4e6a7907b4 100644 --- a/mappings/net/minecraft/world/event/listener/GameEventListener.mapping +++ b/mappings/net/minecraft/world/event/listener/GameEventListener.mapping @@ -2,13 +2,12 @@ CLASS net/minecraft/class_5714 net/minecraft/world/event/listener/GameEventListe COMMENT A game event listener listens to game events from {@link GameEventDispatcher}s. METHOD method_32946 getPositionSource ()Lnet/minecraft/class_5716; COMMENT Returns the position source of this listener. - METHOD method_32947 listen (Lnet/minecraft/class_3218;Lnet/minecraft/class_5712;Lnet/minecraft/class_1297;Lnet/minecraft/class_243;)Z + METHOD method_32947 listen (Lnet/minecraft/class_3218;Lnet/minecraft/class_5712;Lnet/minecraft/class_5712$class_7397;Lnet/minecraft/class_243;)Z COMMENT Listens to an incoming game event. COMMENT COMMENT @return {@code true} if the game event has been accepted by this listener ARG 1 world ARG 2 event - ARG 3 entity ARG 4 pos METHOD method_32948 getRange ()I COMMENT Returns the range, in blocks, of the listener. diff --git a/mappings/net/minecraft/world/event/listener/SculkSensorListener.mapping b/mappings/net/minecraft/world/event/listener/SculkSensorListener.mapping index e05352e0ff..e59e27a5ee 100644 --- a/mappings/net/minecraft/world/event/listener/SculkSensorListener.mapping +++ b/mappings/net/minecraft/world/event/listener/SculkSensorListener.mapping @@ -20,10 +20,9 @@ CLASS net/minecraft/class_5718 net/minecraft/world/event/listener/SculkSensorLis ARG 2 end METHOD method_32967 (Lnet/minecraft/class_2680;)Z ARG 0 state - METHOD method_42339 listen (Lnet/minecraft/class_3218;Lnet/minecraft/class_5712;Lnet/minecraft/class_1297;Lnet/minecraft/class_243;Lnet/minecraft/class_243;)V + METHOD method_42339 listen (Lnet/minecraft/class_3218;Lnet/minecraft/class_5712;Lnet/minecraft/class_5712$class_7397;Lnet/minecraft/class_243;Lnet/minecraft/class_243;)V ARG 1 world ARG 2 gameEvent - ARG 3 entity ARG 4 start ARG 5 end METHOD method_42340 createCodec (Lnet/minecraft/class_5718$class_5719;)Lcom/mojang/serialization/Codec; @@ -56,17 +55,15 @@ CLASS net/minecraft/class_5718 net/minecraft/world/event/listener/SculkSensorLis ARG 5 entity ARG 6 sourceEntity ARG 7 delay - METHOD method_32970 accepts (Lnet/minecraft/class_3218;Lnet/minecraft/class_5714;Lnet/minecraft/class_2338;Lnet/minecraft/class_5712;Lnet/minecraft/class_1297;)Z + METHOD method_32970 accepts (Lnet/minecraft/class_3218;Lnet/minecraft/class_5714;Lnet/minecraft/class_2338;Lnet/minecraft/class_5712;Lnet/minecraft/class_5712$class_7397;)Z COMMENT Returns whether the callback wants to accept this event. ARG 1 world ARG 2 listener ARG 3 pos ARG 4 event - ARG 5 entity METHOD method_42210 getTag ()Lnet/minecraft/class_6862; - METHOD method_42324 canAccept (Lnet/minecraft/class_5712;Lnet/minecraft/class_1297;)Z + METHOD method_42324 canAccept (Lnet/minecraft/class_5712;Lnet/minecraft/class_5712$class_7397;)Z ARG 1 gameEvent - ARG 2 entity METHOD method_42672 onListen ()V CLASS class_7269 Vibration FIELD field_38245 CODEC Lcom/mojang/serialization/Codec; diff --git a/mappings/net/minecraft/world/event/listener/SimpleGameEventDispatcher.mapping b/mappings/net/minecraft/world/event/listener/SimpleGameEventDispatcher.mapping index 0ebac52e51..da9293467c 100644 --- a/mappings/net/minecraft/world/event/listener/SimpleGameEventDispatcher.mapping +++ b/mappings/net/minecraft/world/event/listener/SimpleGameEventDispatcher.mapping @@ -10,9 +10,8 @@ CLASS net/minecraft/class_5711 net/minecraft/world/event/listener/SimpleGameEven FIELD field_37675 dispatching Z METHOD (Lnet/minecraft/class_3218;)V ARG 1 world - METHOD method_32936 dispatchTo (Lnet/minecraft/class_3218;Lnet/minecraft/class_5712;Lnet/minecraft/class_1297;Lnet/minecraft/class_243;Lnet/minecraft/class_5714;)Z + METHOD method_32936 dispatchTo (Lnet/minecraft/class_3218;Lnet/minecraft/class_5712;Lnet/minecraft/class_5712$class_7397;Lnet/minecraft/class_243;Lnet/minecraft/class_5714;)Z ARG 0 world ARG 1 event - ARG 2 entity ARG 3 pos ARG 4 listener diff --git a/mappings/net/minecraft/world/explosion/Explosion.mapping b/mappings/net/minecraft/world/explosion/Explosion.mapping index 5f00a835d2..37ed155151 100644 --- a/mappings/net/minecraft/world/explosion/Explosion.mapping +++ b/mappings/net/minecraft/world/explosion/Explosion.mapping @@ -5,7 +5,7 @@ CLASS net/minecraft/class_1927 net/minecraft/world/explosion/Explosion FIELD field_9185 entity Lnet/minecraft/class_1297; FIELD field_9186 createFire Z FIELD field_9187 world Lnet/minecraft/class_1937; - FIELD field_9188 affectedBlocks Ljava/util/List; + FIELD field_9188 affectedBlocks Lit/unimi/dsi/fastutil/objects/ObjectArrayList; FIELD field_9189 z D FIELD field_9190 power F FIELD field_9191 random Lnet/minecraft/class_5819; diff --git a/mappings/net/minecraft/world/gen/blockpredicate/BlockPredicate.mapping b/mappings/net/minecraft/world/gen/blockpredicate/BlockPredicate.mapping index ee9e59fcf9..b0b4a4b97b 100644 --- a/mappings/net/minecraft/world/gen/blockpredicate/BlockPredicate.mapping +++ b/mappings/net/minecraft/world/gen/blockpredicate/BlockPredicate.mapping @@ -3,22 +3,16 @@ CLASS net/minecraft/class_6646 net/minecraft/world/gen/blockpredicate/BlockPredi FIELD field_35696 IS_AIR Lnet/minecraft/class_6646; FIELD field_35697 IS_AIR_OR_WATER Lnet/minecraft/class_6646; METHOD method_38873 getType ()Lnet/minecraft/class_6647; - METHOD method_38876 matchingBlock (Lnet/minecraft/class_2248;Lnet/minecraft/class_2382;)Lnet/minecraft/class_6646; - ARG 0 block - ARG 1 offset METHOD method_38877 not (Lnet/minecraft/class_6646;)Lnet/minecraft/class_6646; ARG 0 predicate METHOD method_38878 bothOf (Lnet/minecraft/class_6646;Lnet/minecraft/class_6646;)Lnet/minecraft/class_6646; ARG 0 first ARG 1 second - METHOD method_38879 matchingFluid (Lnet/minecraft/class_3611;Lnet/minecraft/class_2382;)Lnet/minecraft/class_6646; - ARG 0 fluid - ARG 1 offset METHOD method_38880 allOf (Ljava/util/List;)Lnet/minecraft/class_6646; ARG 0 predicates - METHOD method_38881 matchingBlocks (Ljava/util/List;Lnet/minecraft/class_2382;)Lnet/minecraft/class_6646; - ARG 0 blocks - ARG 1 offset + METHOD method_38881 matchingBlocks (Lnet/minecraft/class_2382;Ljava/util/List;)Lnet/minecraft/class_6646; + ARG 0 offset + ARG 1 blocks METHOD method_38882 allOf ([Lnet/minecraft/class_6646;)Lnet/minecraft/class_6646; ARG 0 predicates METHOD method_38883 replaceable ()Lnet/minecraft/class_6646; @@ -27,9 +21,9 @@ CLASS net/minecraft/class_6646 net/minecraft/world/gen/blockpredicate/BlockPredi ARG 1 second METHOD method_38885 anyOf (Ljava/util/List;)Lnet/minecraft/class_6646; ARG 0 predicates - METHOD method_38886 matchingFluids (Ljava/util/List;Lnet/minecraft/class_2382;)Lnet/minecraft/class_6646; - ARG 0 fluids - ARG 1 offset + METHOD method_38886 matchingFluids (Lnet/minecraft/class_2382;Ljava/util/List;)Lnet/minecraft/class_6646; + ARG 0 offset + ARG 1 fluids METHOD method_38887 anyOf ([Lnet/minecraft/class_6646;)Lnet/minecraft/class_6646; ARG 0 predicates METHOD method_39009 wouldSurvive (Lnet/minecraft/class_2680;Lnet/minecraft/class_2382;)Lnet/minecraft/class_6646; @@ -45,9 +39,9 @@ CLASS net/minecraft/class_6646 net/minecraft/world/gen/blockpredicate/BlockPredi ARG 0 offset METHOD method_39907 matchingBlockTag (Lnet/minecraft/class_6862;)Lnet/minecraft/class_6646; ARG 0 offset - METHOD method_39908 matchingBlockTag (Lnet/minecraft/class_6862;Lnet/minecraft/class_2382;)Lnet/minecraft/class_6646; - ARG 0 tag - ARG 1 offset + METHOD method_39908 matchingBlockTag (Lnet/minecraft/class_2382;Lnet/minecraft/class_6862;)Lnet/minecraft/class_6646; + ARG 0 offset + ARG 1 tag METHOD method_39909 hasSturdyFace (Lnet/minecraft/class_2382;Lnet/minecraft/class_2350;)Lnet/minecraft/class_6646; ARG 0 offset ARG 1 face diff --git a/mappings/net/minecraft/world/gen/carver/Carver.mapping b/mappings/net/minecraft/world/gen/carver/Carver.mapping index b05faf60d0..c03ebfce52 100644 --- a/mappings/net/minecraft/world/gen/carver/Carver.mapping +++ b/mappings/net/minecraft/world/gen/carver/Carver.mapping @@ -4,7 +4,6 @@ CLASS net/minecraft/class_2939 net/minecraft/world/gen/carver/Carver FIELD field_13296 LAVA Lnet/minecraft/class_3610; FIELD field_13298 carvableFluids Ljava/util/Set; FIELD field_13301 AIR Lnet/minecraft/class_2680; - FIELD field_13302 alwaysCarvableBlocks Ljava/util/Set; FIELD field_13305 WATER Lnet/minecraft/class_3610; FIELD field_24831 codec Lcom/mojang/serialization/Codec; METHOD (Lcom/mojang/serialization/Codec;)V @@ -24,8 +23,7 @@ CLASS net/minecraft/class_2939 net/minecraft/world/gen/carver/Carver METHOD method_12705 shouldCarve (Lnet/minecraft/class_5871;Lnet/minecraft/class_5819;)Z ARG 1 config ARG 2 random - METHOD method_12709 canAlwaysCarveBlock (Lnet/minecraft/class_2680;)Z - ARG 1 state + METHOD method_12709 canAlwaysCarveBlock (Lnet/minecraft/class_5871;Lnet/minecraft/class_2680;)Z METHOD method_12710 getBranchFactor ()I METHOD method_16581 carveAtPoint (Lnet/minecraft/class_5873;Lnet/minecraft/class_5871;Lnet/minecraft/class_2791;Ljava/util/function/Function;Lnet/minecraft/class_6643;Lnet/minecraft/class_2338$class_2339;Lnet/minecraft/class_2338$class_2339;Lnet/minecraft/class_6350;Lorg/apache/commons/lang3/mutable/MutableBoolean;)Z ARG 1 context diff --git a/mappings/net/minecraft/world/gen/carver/CarverConfig.mapping b/mappings/net/minecraft/world/gen/carver/CarverConfig.mapping index 9567f59fb5..c13406683a 100644 --- a/mappings/net/minecraft/world/gen/carver/CarverConfig.mapping +++ b/mappings/net/minecraft/world/gen/carver/CarverConfig.mapping @@ -4,7 +4,7 @@ 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; - METHOD (FLnet/minecraft/class_6122;Lnet/minecraft/class_5863;Lnet/minecraft/class_5843;Lnet/minecraft/class_5872;)V + METHOD (FLnet/minecraft/class_6122;Lnet/minecraft/class_5863;Lnet/minecraft/class_5843;Lnet/minecraft/class_5872;Lnet/minecraft/class_6885;)V ARG 1 probability ARG 2 y ARG 3 yScale diff --git a/mappings/net/minecraft/world/gen/carver/CaveCarverConfig.mapping b/mappings/net/minecraft/world/gen/carver/CaveCarverConfig.mapping index 06310a0243..e8fa02899a 100644 --- a/mappings/net/minecraft/world/gen/carver/CaveCarverConfig.mapping +++ b/mappings/net/minecraft/world/gen/carver/CaveCarverConfig.mapping @@ -3,24 +3,17 @@ 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 + METHOD (FLnet/minecraft/class_6122;Lnet/minecraft/class_5863;Lnet/minecraft/class_5843;Lnet/minecraft/class_5872;Lnet/minecraft/class_6885;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 debugConfig - 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_5863;Lnet/minecraft/class_5863;Lnet/minecraft/class_5863;)V + METHOD (FLnet/minecraft/class_6122;Lnet/minecraft/class_5863;Lnet/minecraft/class_5843;Lnet/minecraft/class_6885;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 horizontalRadiusMultiplier - ARG 7 verticalRadiusMultiplier - ARG 8 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 97e60ec493..d989756dc7 100644 --- a/mappings/net/minecraft/world/gen/carver/RavineCarverConfig.mapping +++ b/mappings/net/minecraft/world/gen/carver/RavineCarverConfig.mapping @@ -2,14 +2,12 @@ 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;Lnet/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_6885;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 debugConfig - ARG 6 verticalRotation - ARG 7 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/feature/DiskFeature.mapping b/mappings/net/minecraft/world/gen/feature/DiskFeature.mapping index bbabf91a91..a8cce314f3 100644 --- a/mappings/net/minecraft/world/gen/feature/DiskFeature.mapping +++ b/mappings/net/minecraft/world/gen/feature/DiskFeature.mapping @@ -1,12 +1,2 @@ CLASS net/minecraft/class_3011 net/minecraft/world/gen/feature/DiskFeature - METHOD method_43159 getSandstone (Lnet/minecraft/class_6577;)Lnet/minecraft/class_2680; - ARG 1 config - METHOD method_43160 placeBlock (Lnet/minecraft/class_6577;Lnet/minecraft/class_5281;IILnet/minecraft/class_2338$class_2339;)Z - ARG 1 config - ARG 2 world - ARG 3 topY - ARG 4 bottomY - ARG 5 pos - METHOD method_43161 anyTargetsMatch (Lnet/minecraft/class_6577;Lnet/minecraft/class_2680;)Z - ARG 1 config - ARG 2 state + METHOD method_43160 placeBlock (Lnet/minecraft/class_6577;Lnet/minecraft/class_5281;Lnet/minecraft/class_5819;IILnet/minecraft/class_2338$class_2339;)Z diff --git a/mappings/net/minecraft/world/gen/feature/DiskFeatureConfig.mapping b/mappings/net/minecraft/world/gen/feature/DiskFeatureConfig.mapping index 21d2b306c9..43e73928a4 100644 --- a/mappings/net/minecraft/world/gen/feature/DiskFeatureConfig.mapping +++ b/mappings/net/minecraft/world/gen/feature/DiskFeatureConfig.mapping @@ -1,12 +1,6 @@ CLASS net/minecraft/class_6577 net/minecraft/world/gen/feature/DiskFeatureConfig - FIELD comp_80 state Lnet/minecraft/class_2680; FIELD comp_81 radius Lnet/minecraft/class_6017; FIELD comp_82 halfHeight I - FIELD comp_83 targets Ljava/util/List; FIELD field_34698 CODEC Lcom/mojang/serialization/Codec; - METHOD comp_80 state ()Lnet/minecraft/class_2680; METHOD comp_81 radius ()Lnet/minecraft/class_6017; METHOD comp_82 halfHeight ()I - METHOD comp_83 targets ()Ljava/util/List; - METHOD method_43163 (Lnet/minecraft/class_6577;)Lnet/minecraft/class_6885; - ARG 0 config diff --git a/mappings/net/minecraft/world/gen/feature/Feature.mapping b/mappings/net/minecraft/world/gen/feature/Feature.mapping index 0e4b7d97e5..b2be83c7bb 100644 --- a/mappings/net/minecraft/world/gen/feature/Feature.mapping +++ b/mappings/net/minecraft/world/gen/feature/Feature.mapping @@ -22,9 +22,6 @@ CLASS net/minecraft/class_3031 net/minecraft/world/gen/feature/Feature METHOD method_27368 isSoil (Lnet/minecraft/class_3746;Lnet/minecraft/class_2338;)Z ARG 0 world ARG 1 pos - METHOD method_27370 isAir (Lnet/minecraft/class_3746;Lnet/minecraft/class_2338;)Z - ARG 0 world - ARG 1 pos METHOD method_28627 getCodec ()Lcom/mojang/serialization/Codec; METHOD method_28629 (Lnet/minecraft/class_3037;)Lnet/minecraft/class_2975; ARG 1 config diff --git a/mappings/net/minecraft/world/gen/feature/IcePatchFeature.mapping b/mappings/net/minecraft/world/gen/feature/IcePatchFeature.mapping deleted file mode 100644 index 2eb423c8f9..0000000000 --- a/mappings/net/minecraft/world/gen/feature/IcePatchFeature.mapping +++ /dev/null @@ -1 +0,0 @@ -CLASS net/minecraft/class_3063 net/minecraft/world/gen/feature/IcePatchFeature diff --git a/mappings/net/minecraft/world/gen/feature/MultifaceGrowthFeature.mapping b/mappings/net/minecraft/world/gen/feature/MultifaceGrowthFeature.mapping index 4dcda1737d..ee7ad6dc04 100644 --- a/mappings/net/minecraft/world/gen/feature/MultifaceGrowthFeature.mapping +++ b/mappings/net/minecraft/world/gen/feature/MultifaceGrowthFeature.mapping @@ -5,12 +5,5 @@ CLASS net/minecraft/class_5779 net/minecraft/world/gen/feature/MultifaceGrowthFe ARG 2 state ARG 3 config ARG 5 directions - METHOD method_33392 shuffleDirections (Lnet/minecraft/class_5780;Lnet/minecraft/class_5819;)Ljava/util/List; - ARG 0 config - METHOD method_33393 shuffleDirections (Lnet/minecraft/class_5780;Lnet/minecraft/class_5819;Lnet/minecraft/class_2350;)Ljava/util/List; - ARG 0 config - ARG 2 excluded - METHOD method_33394 (Lnet/minecraft/class_2350;Lnet/minecraft/class_2350;)Z - ARG 1 direction METHOD method_33395 isAirOrWater (Lnet/minecraft/class_2680;)Z ARG 0 state diff --git a/mappings/net/minecraft/world/gen/feature/MultifaceGrowthFeatureConfig.mapping b/mappings/net/minecraft/world/gen/feature/MultifaceGrowthFeatureConfig.mapping index 5242437b7f..ce6cc75b5a 100644 --- a/mappings/net/minecraft/world/gen/feature/MultifaceGrowthFeatureConfig.mapping +++ b/mappings/net/minecraft/world/gen/feature/MultifaceGrowthFeatureConfig.mapping @@ -6,7 +6,7 @@ CLASS net/minecraft/class_5780 net/minecraft/world/gen/feature/MultifaceGrowthFe FIELD field_28433 placeOnWalls Z FIELD field_28434 spreadChance F FIELD field_28435 canPlaceOn Lnet/minecraft/class_6885; - FIELD field_28436 directions Ljava/util/List; + FIELD field_28436 directions Lit/unimi/dsi/fastutil/objects/ObjectArrayList; FIELD field_37709 lichen Lnet/minecraft/class_5778; METHOD (Lnet/minecraft/class_5778;IZZZFLnet/minecraft/class_6885;)V ARG 1 lichen diff --git a/mappings/net/minecraft/world/gen/feature/SimpleDiskFeature.mapping b/mappings/net/minecraft/world/gen/feature/SimpleDiskFeature.mapping deleted file mode 100644 index b69a33ac21..0000000000 --- a/mappings/net/minecraft/world/gen/feature/SimpleDiskFeature.mapping +++ /dev/null @@ -1 +0,0 @@ -CLASS net/minecraft/class_5433 net/minecraft/world/gen/feature/SimpleDiskFeature diff --git a/mappings/net/minecraft/world/gen/feature/SurfaceDiskFeature.mapping b/mappings/net/minecraft/world/gen/feature/SurfaceDiskFeature.mapping deleted file mode 100644 index e4216f03e8..0000000000 --- a/mappings/net/minecraft/world/gen/feature/SurfaceDiskFeature.mapping +++ /dev/null @@ -1 +0,0 @@ -CLASS net/minecraft/class_7385 net/minecraft/world/gen/feature/SurfaceDiskFeature diff --git a/mappings/net/minecraft/world/gen/feature/TreeFeature.mapping b/mappings/net/minecraft/world/gen/feature/TreeFeature.mapping index fbb6aeba0f..9cf9166edd 100644 --- a/mappings/net/minecraft/world/gen/feature/TreeFeature.mapping +++ b/mappings/net/minecraft/world/gen/feature/TreeFeature.mapping @@ -35,8 +35,6 @@ CLASS net/minecraft/class_2944 net/minecraft/world/gen/feature/TreeFeature ARG 1 box ARG 2 trunkPositions ARG 3 decorationPositions - METHOD method_23381 (Lnet/minecraft/class_5281;Ljava/util/function/BiConsumer;Lnet/minecraft/class_5819;Ljava/util/List;Ljava/util/List;Ljava/util/List;Lnet/minecraft/class_4662;)V - ARG 6 decorator METHOD method_23384 (Lnet/minecraft/class_2680;)Z ARG 0 state METHOD method_27371 canReplace (Lnet/minecraft/class_3746;Lnet/minecraft/class_2338;)Z diff --git a/mappings/net/minecraft/world/gen/root/MangroveRootPlacer.mapping b/mappings/net/minecraft/world/gen/root/MangroveRootPlacer.mapping index 06760e86d8..2be101d5b9 100644 --- a/mappings/net/minecraft/world/gen/root/MangroveRootPlacer.mapping +++ b/mappings/net/minecraft/world/gen/root/MangroveRootPlacer.mapping @@ -1,21 +1,5 @@ CLASS net/minecraft/class_7386 net/minecraft/world/gen/root/MangroveRootPlacer FIELD field_38771 CODEC Lcom/mojang/serialization/Codec; - FIELD field_38772 canGrowThrough Lnet/minecraft/class_6885; - FIELD field_38773 muddyRootsIn Lnet/minecraft/class_6885; - FIELD field_38774 muddyRootsProvider Lnet/minecraft/class_4651; - FIELD field_38775 maxRootWidth I - FIELD field_38776 maxRootLength I - FIELD field_38777 yOffset Lnet/minecraft/class_6017; - FIELD field_38778 randomSkewChance F - METHOD (Lnet/minecraft/class_4651;Lnet/minecraft/class_6885;Lnet/minecraft/class_6885;Lnet/minecraft/class_4651;IILnet/minecraft/class_6017;F)V - ARG 1 rootProvider - ARG 2 canGrowThrough - ARG 3 muddyRootsIn - ARG 4 muddyRootsProvider - ARG 5 maxRootWidth - ARG 6 maxRootLength - ARG 7 yOffset - ARG 8 randomSkewChance METHOD method_43166 canGrow (Lnet/minecraft/class_3746;Lnet/minecraft/class_5819;Lnet/minecraft/class_2338;Lnet/minecraft/class_2350;Lnet/minecraft/class_2338;Ljava/util/List;I)Z ARG 1 world ARG 2 random @@ -29,8 +13,6 @@ CLASS net/minecraft/class_7386 net/minecraft/world/gen/root/MangroveRootPlacer ARG 2 pos METHOD method_43169 (Lnet/minecraft/class_2680;)Z ARG 1 state - METHOD method_43170 (Lnet/minecraft/class_7386;)Ljava/lang/Float; - ARG 0 rootPlacer METHOD method_43171 getOffshootPositions (Lnet/minecraft/class_2338;Lnet/minecraft/class_2350;Lnet/minecraft/class_5819;Lnet/minecraft/class_2338;)Ljava/util/List; ARG 1 pos ARG 2 direction @@ -38,15 +20,5 @@ CLASS net/minecraft/class_7386 net/minecraft/world/gen/root/MangroveRootPlacer ARG 4 origin METHOD method_43174 (Lnet/minecraft/class_2680;)Z ARG 1 state - METHOD method_43175 (Lnet/minecraft/class_7386;)Lnet/minecraft/class_6017; - ARG 0 rootPlacer - METHOD method_43176 (Lnet/minecraft/class_7386;)Ljava/lang/Integer; - ARG 0 rootPlacer - METHOD method_43177 (Lnet/minecraft/class_7386;)Ljava/lang/Integer; - ARG 0 rootPlacer - METHOD method_43178 (Lnet/minecraft/class_7386;)Lnet/minecraft/class_4651; - ARG 0 rootPlacer - METHOD method_43179 (Lnet/minecraft/class_7386;)Lnet/minecraft/class_6885; - ARG 0 rootPlacer - METHOD method_43180 (Lnet/minecraft/class_7386;)Lnet/minecraft/class_6885; + METHOD method_43180 (Lnet/minecraft/class_7386;)Lnet/minecraft/class_7399; ARG 0 rootPlacer diff --git a/mappings/net/minecraft/world/gen/root/RootPlacer.mapping b/mappings/net/minecraft/world/gen/root/RootPlacer.mapping index 2274c6a3cb..6a5875e5b5 100644 --- a/mappings/net/minecraft/world/gen/root/RootPlacer.mapping +++ b/mappings/net/minecraft/world/gen/root/RootPlacer.mapping @@ -1,15 +1,12 @@ CLASS net/minecraft/class_7387 net/minecraft/world/gen/root/RootPlacer FIELD field_38779 TYPE_CODEC Lcom/mojang/serialization/Codec; FIELD field_38780 rootProvider Lnet/minecraft/class_4651; - METHOD (Lnet/minecraft/class_4651;)V - ARG 1 rootProvider METHOD method_43165 getType ()Lnet/minecraft/class_7388; - METHOD method_43168 generate (Lnet/minecraft/class_3746;Ljava/util/function/BiConsumer;Lnet/minecraft/class_5819;Lnet/minecraft/class_2338;Lnet/minecraft/class_4643;)Ljava/util/Optional; + METHOD method_43168 generate (Lnet/minecraft/class_3746;Ljava/util/function/BiConsumer;Lnet/minecraft/class_5819;Lnet/minecraft/class_2338;Lnet/minecraft/class_2338;Lnet/minecraft/class_4643;)Z ARG 1 world ARG 2 replacer ARG 3 random ARG 4 pos - ARG 5 config METHOD method_43172 placeRoots (Lnet/minecraft/class_3746;Ljava/util/function/BiConsumer;Lnet/minecraft/class_5819;Lnet/minecraft/class_2338;Lnet/minecraft/class_4643;)V ARG 1 world ARG 2 replacer diff --git a/mappings/net/minecraft/world/gen/treedecorator/AlterGroundTreeDecorator.mapping b/mappings/net/minecraft/world/gen/treedecorator/AlterGroundTreeDecorator.mapping index 1c891a1400..8a198c1ee2 100644 --- a/mappings/net/minecraft/world/gen/treedecorator/AlterGroundTreeDecorator.mapping +++ b/mappings/net/minecraft/world/gen/treedecorator/AlterGroundTreeDecorator.mapping @@ -5,17 +5,7 @@ CLASS net/minecraft/class_4658 net/minecraft/world/gen/treedecorator/AlterGround ARG 1 provider METHOD method_23460 (ILnet/minecraft/class_2338;)Z ARG 1 pos - METHOD method_23461 (Lnet/minecraft/class_3746;Ljava/util/function/BiConsumer;Lnet/minecraft/class_5819;Lnet/minecraft/class_2338;)V - ARG 4 pos - METHOD method_23462 setArea (Lnet/minecraft/class_3746;Ljava/util/function/BiConsumer;Lnet/minecraft/class_5819;Lnet/minecraft/class_2338;)V - ARG 1 world - ARG 2 replacer - ARG 3 random - ARG 4 pos - METHOD method_23463 setColumn (Lnet/minecraft/class_3746;Ljava/util/function/BiConsumer;Lnet/minecraft/class_5819;Lnet/minecraft/class_2338;)V - ARG 1 world - ARG 2 replacer - ARG 3 random - ARG 4 pos + METHOD method_23462 setArea (Lnet/minecraft/class_4662$class_7402;Lnet/minecraft/class_2338;)V + METHOD method_23463 setColumn (Lnet/minecraft/class_4662$class_7402;Lnet/minecraft/class_2338;)V METHOD method_28889 (Lnet/minecraft/class_4658;)Lnet/minecraft/class_4651; ARG 0 decorator diff --git a/mappings/net/minecraft/world/gen/treedecorator/AttachedToLeavesTreeDecorator.mapping b/mappings/net/minecraft/world/gen/treedecorator/AttachedToLeavesTreeDecorator.mapping index 05c10eccfc..b60713feac 100644 --- a/mappings/net/minecraft/world/gen/treedecorator/AttachedToLeavesTreeDecorator.mapping +++ b/mappings/net/minecraft/world/gen/treedecorator/AttachedToLeavesTreeDecorator.mapping @@ -13,8 +13,7 @@ CLASS net/minecraft/class_7389 net/minecraft/world/gen/treedecorator/AttachedToL ARG 4 blockProvider ARG 5 requiredEmptyBlocks ARG 6 directions - METHOD method_43187 meetsRequiredEmptyBlocks (Lnet/minecraft/class_3746;Lnet/minecraft/class_2338;Lnet/minecraft/class_2350;)Z - ARG 1 world + METHOD method_43187 meetsRequiredEmptyBlocks (Lnet/minecraft/class_4662$class_7402;Lnet/minecraft/class_2338;Lnet/minecraft/class_2350;)Z ARG 2 pos ARG 3 direction METHOD method_43189 (Lnet/minecraft/class_7389;)Ljava/util/List; diff --git a/mappings/net/minecraft/world/gen/treedecorator/BeehiveTreeDecorator.mapping b/mappings/net/minecraft/world/gen/treedecorator/BeehiveTreeDecorator.mapping index f21cfd8e33..8de6343bab 100644 --- a/mappings/net/minecraft/world/gen/treedecorator/BeehiveTreeDecorator.mapping +++ b/mappings/net/minecraft/world/gen/treedecorator/BeehiveTreeDecorator.mapping @@ -11,7 +11,7 @@ CLASS net/minecraft/class_4659 net/minecraft/world/gen/treedecorator/BeehiveTree ARG 0 decorator METHOD method_35373 (Lnet/minecraft/class_5819;Lnet/minecraft/class_4482;)V ARG 1 blockEntity - METHOD method_40032 (Lnet/minecraft/class_3746;Lnet/minecraft/class_2338;)Z + METHOD method_40032 (Lnet/minecraft/class_4662$class_7402;Lnet/minecraft/class_2338;)Z ARG 1 pos METHOD method_40033 (Lnet/minecraft/class_2338;)Ljava/util/stream/Stream; ARG 0 pos diff --git a/mappings/net/minecraft/world/gen/treedecorator/CocoaBeansTreeDecorator.mapping b/mappings/net/minecraft/world/gen/treedecorator/CocoaBeansTreeDecorator.mapping index 02a6d44d82..b0c9559789 100644 --- a/mappings/net/minecraft/world/gen/treedecorator/CocoaBeansTreeDecorator.mapping +++ b/mappings/net/minecraft/world/gen/treedecorator/CocoaBeansTreeDecorator.mapping @@ -5,7 +5,5 @@ CLASS net/minecraft/class_4660 net/minecraft/world/gen/treedecorator/CocoaBeansT ARG 1 probability METHOD method_23465 (ILnet/minecraft/class_2338;)Z ARG 1 pos - METHOD method_23466 (Lnet/minecraft/class_5819;Lnet/minecraft/class_3746;Ljava/util/function/BiConsumer;Lnet/minecraft/class_2338;)V - ARG 3 pos METHOD method_28891 (Lnet/minecraft/class_4660;)Ljava/lang/Float; ARG 0 decorator diff --git a/mappings/net/minecraft/world/gen/treedecorator/LeavesVineTreeDecorator.mapping b/mappings/net/minecraft/world/gen/treedecorator/LeavesVineTreeDecorator.mapping index 41b3e297e0..2c5748809b 100644 --- a/mappings/net/minecraft/world/gen/treedecorator/LeavesVineTreeDecorator.mapping +++ b/mappings/net/minecraft/world/gen/treedecorator/LeavesVineTreeDecorator.mapping @@ -3,13 +3,7 @@ CLASS net/minecraft/class_4661 net/minecraft/world/gen/treedecorator/LeavesVineT FIELD field_38790 probability F METHOD (F)V ARG 1 probability - METHOD method_23467 placeVines (Lnet/minecraft/class_3746;Lnet/minecraft/class_2338;Lnet/minecraft/class_2746;Ljava/util/function/BiConsumer;)V + METHOD method_23467 placeVines (Lnet/minecraft/class_2338;Lnet/minecraft/class_2746;Lnet/minecraft/class_4662$class_7402;)V COMMENT Places a vine at a given position and then up to 4 more vines going downwards. - ARG 0 world - ARG 1 pos - ARG 2 facing - ARG 3 replacer - METHOD method_23468 (Lnet/minecraft/class_5819;Lnet/minecraft/class_3746;Ljava/util/function/BiConsumer;Lnet/minecraft/class_2338;)V - ARG 4 pos METHOD method_43195 (Lnet/minecraft/class_4661;)Ljava/lang/Float; ARG 0 treeDecorator diff --git a/mappings/net/minecraft/world/gen/treedecorator/TreeDecorator.mapping b/mappings/net/minecraft/world/gen/treedecorator/TreeDecorator.mapping index 11d225edee..0c4a8eaf3e 100644 --- a/mappings/net/minecraft/world/gen/treedecorator/TreeDecorator.mapping +++ b/mappings/net/minecraft/world/gen/treedecorator/TreeDecorator.mapping @@ -1,15 +1,5 @@ CLASS net/minecraft/class_4662 net/minecraft/world/gen/treedecorator/TreeDecorator COMMENT Tree decorators can add additional blocks to trees, such as vines or beehives. FIELD field_24962 TYPE_CODEC Lcom/mojang/serialization/Codec; - METHOD method_23469 generate (Lnet/minecraft/class_3746;Ljava/util/function/BiConsumer;Lnet/minecraft/class_5819;Ljava/util/List;Ljava/util/List;Ljava/util/List;)V - ARG 1 world - ARG 2 replacer - ARG 3 random - ARG 4 logPositions - ARG 5 leavesPositions - ARG 6 rootPositions - METHOD method_23471 placeVine (Ljava/util/function/BiConsumer;Lnet/minecraft/class_2338;Lnet/minecraft/class_2746;)V - ARG 0 replacer - ARG 1 pos - ARG 2 facing + METHOD method_23469 generate (Lnet/minecraft/class_4662$class_7402;)V METHOD method_28893 getType ()Lnet/minecraft/class_4663; diff --git a/mappings/net/minecraft/world/gen/treedecorator/TrunkVineTreeDecorator.mapping b/mappings/net/minecraft/world/gen/treedecorator/TrunkVineTreeDecorator.mapping index 43f171971b..7dcb345f24 100644 --- a/mappings/net/minecraft/world/gen/treedecorator/TrunkVineTreeDecorator.mapping +++ b/mappings/net/minecraft/world/gen/treedecorator/TrunkVineTreeDecorator.mapping @@ -1,5 +1,3 @@ CLASS net/minecraft/class_4664 net/minecraft/world/gen/treedecorator/TrunkVineTreeDecorator FIELD field_24964 CODEC Lcom/mojang/serialization/Codec; FIELD field_24965 INSTANCE Lnet/minecraft/class_4664; - METHOD method_23474 (Lnet/minecraft/class_5819;Lnet/minecraft/class_3746;Ljava/util/function/BiConsumer;Lnet/minecraft/class_2338;)V - ARG 3 pos