diff --git a/build.gradle b/build.gradle index 3b43039f67..77a0ba530d 100644 --- a/build.gradle +++ b/build.gradle @@ -21,7 +21,7 @@ plugins { id 'net.fabricmc.filament' } -def minecraft_version = "23w13a" +def minecraft_version = "23w13a_or_b" filament { minecraftVersion = minecraft_version diff --git a/mappings/net/minecraft/block/Blocks.mapping b/mappings/net/minecraft/block/Blocks.mapping index 466546a877..ff3a9db616 100644 --- a/mappings/net/minecraft/block/Blocks.mapping +++ b/mappings/net/minecraft/block/Blocks.mapping @@ -73,8 +73,6 @@ CLASS net/minecraft/class_2246 net/minecraft/block/Blocks ARG 1 world ARG 2 pos ARG 3 type - METHOD method_26127 (Lnet/minecraft/class_2680;)I - ARG 0 state METHOD method_26128 (Lnet/minecraft/class_2680;Lnet/minecraft/class_1922;Lnet/minecraft/class_2338;Lnet/minecraft/class_1299;)Z ARG 0 state ARG 1 world @@ -87,8 +85,6 @@ CLASS net/minecraft/class_2246 net/minecraft/block/Blocks ARG 1 world ARG 2 pos ARG 3 entityType - METHOD method_26131 (Lnet/minecraft/class_2680;)I - ARG 0 state METHOD method_26132 (Lnet/minecraft/class_2680;Lnet/minecraft/class_1922;Lnet/minecraft/class_2338;Lnet/minecraft/class_1299;)Z ARG 0 state ARG 1 world @@ -116,8 +112,6 @@ CLASS net/minecraft/class_2246 net/minecraft/block/Blocks ARG 0 state METHOD method_26144 (Lnet/minecraft/class_2680;)I ARG 0 state - METHOD method_26145 (Lnet/minecraft/class_2680;)I - ARG 0 state METHOD method_26146 (Lnet/minecraft/class_2680;)I ARG 0 state METHOD method_26147 (Lnet/minecraft/class_2680;)I diff --git a/mappings/net/minecraft/block/CakeBlock.mapping b/mappings/net/minecraft/block/CakeBlock.mapping index b5c1df0e2f..a385196603 100644 --- a/mappings/net/minecraft/block/CakeBlock.mapping +++ b/mappings/net/minecraft/block/CakeBlock.mapping @@ -6,7 +6,5 @@ CLASS net/minecraft/class_2272 net/minecraft/block/CakeBlock METHOD method_31627 getComparatorOutput (I)I ARG 0 bites METHOD method_9719 tryEat (Lnet/minecraft/class_1936;Lnet/minecraft/class_2338;Lnet/minecraft/class_2680;Lnet/minecraft/class_1657;)Lnet/minecraft/class_1269; - ARG 0 world ARG 1 pos - ARG 2 state ARG 3 player diff --git a/mappings/net/minecraft/block/FireBlock.mapping b/mappings/net/minecraft/block/FireBlock.mapping index 33953733ee..bf96f07de6 100644 --- a/mappings/net/minecraft/block/FireBlock.mapping +++ b/mappings/net/minecraft/block/FireBlock.mapping @@ -19,9 +19,7 @@ CLASS net/minecraft/class_2358 net/minecraft/block/FireBlock ARG 2 burnChance ARG 3 spreadChance METHOD method_10190 getSpreadChance (Lnet/minecraft/class_2680;)I - ARG 1 state METHOD method_10191 getBurnChance (Lnet/minecraft/class_2680;)I - ARG 1 state METHOD method_10192 isRainingAround (Lnet/minecraft/class_1937;Lnet/minecraft/class_2338;)Z ARG 1 world ARG 2 pos diff --git a/mappings/net/minecraft/block/PistonExtensionBlock.mapping b/mappings/net/minecraft/block/PistonExtensionBlock.mapping index e85f9d483d..4972548117 100644 --- a/mappings/net/minecraft/block/PistonExtensionBlock.mapping +++ b/mappings/net/minecraft/block/PistonExtensionBlock.mapping @@ -4,7 +4,7 @@ CLASS net/minecraft/class_2667 net/minecraft/block/PistonExtensionBlock METHOD method_11488 getPistonBlockEntity (Lnet/minecraft/class_1922;Lnet/minecraft/class_2338;)Lnet/minecraft/class_2669; ARG 1 world ARG 2 pos - METHOD method_11489 createBlockEntityPiston (Lnet/minecraft/class_2338;Lnet/minecraft/class_2680;Lnet/minecraft/class_2680;Lnet/minecraft/class_2350;ZZ)Lnet/minecraft/class_2586; + METHOD method_11489 createBlockEntityPiston (Lnet/minecraft/class_2338;Lnet/minecraft/class_2680;Lnet/minecraft/class_2680;Lnet/minecraft/class_2350;ZZ)Lnet/minecraft/class_2669; ARG 0 pos ARG 1 state ARG 2 pushedBlock diff --git a/mappings/net/minecraft/block/TntBlock.mapping b/mappings/net/minecraft/block/TntBlock.mapping index d5a4562bb0..f2fcbb58b6 100644 --- a/mappings/net/minecraft/block/TntBlock.mapping +++ b/mappings/net/minecraft/block/TntBlock.mapping @@ -1,10 +1,10 @@ CLASS net/minecraft/class_2530 net/minecraft/block/TntBlock FIELD field_11621 UNSTABLE Lnet/minecraft/class_2746; - METHOD method_10737 primeTnt (Lnet/minecraft/class_1937;Lnet/minecraft/class_2338;Lnet/minecraft/class_1309;)V + METHOD method_10737 primeTnt (Lnet/minecraft/class_1937;Lnet/minecraft/class_2338;Lnet/minecraft/class_1309;Lnet/minecraft/class_2680;)V ARG 0 world ARG 1 pos ARG 2 igniter - METHOD method_10738 primeTnt (Lnet/minecraft/class_1937;Lnet/minecraft/class_2338;)V + METHOD method_10738 primeTnt (Lnet/minecraft/class_1937;Lnet/minecraft/class_2338;Lnet/minecraft/class_2680;)V ARG 0 world ARG 1 pos METHOD method_20292 (Lnet/minecraft/class_1268;Lnet/minecraft/class_1657;)V diff --git a/mappings/net/minecraft/block/piston/PistonHandler.mapping b/mappings/net/minecraft/block/piston/PistonHandler.mapping index 316936cd98..24e150ab31 100644 --- a/mappings/net/minecraft/block/piston/PistonHandler.mapping +++ b/mappings/net/minecraft/block/piston/PistonHandler.mapping @@ -26,7 +26,5 @@ CLASS net/minecraft/class_2674 net/minecraft/block/piston/PistonHandler METHOD method_11541 getMovedBlocks ()Ljava/util/List; METHOD method_23367 isBlockSticky (Lnet/minecraft/class_2680;)Z ARG 0 state - METHOD method_23675 isAdjacentBlockStuck (Lnet/minecraft/class_2680;Lnet/minecraft/class_2680;)Z - ARG 0 state - ARG 1 adjacentState + METHOD method_23675 isAdjacentBlockStuck (Lnet/minecraft/class_2338;Lnet/minecraft/class_2680;Lnet/minecraft/class_2338;Lnet/minecraft/class_2680;Lnet/minecraft/class_2350;)Z METHOD method_35299 getMotionDirection ()Lnet/minecraft/class_2350; diff --git a/mappings/net/minecraft/client/color/world/BiomeColors.mapping b/mappings/net/minecraft/client/color/world/BiomeColors.mapping index dae0c899d0..06470e5bb7 100644 --- a/mappings/net/minecraft/client/color/world/BiomeColors.mapping +++ b/mappings/net/minecraft/client/color/world/BiomeColors.mapping @@ -2,12 +2,10 @@ CLASS net/minecraft/class_1163 net/minecraft/client/color/world/BiomeColors FIELD field_5664 FOLIAGE_COLOR Lnet/minecraft/class_6539; FIELD field_5665 GRASS_COLOR Lnet/minecraft/class_6539; FIELD field_5666 WATER_COLOR Lnet/minecraft/class_6539; - METHOD method_23790 (Lnet/minecraft/class_1959;DD)I - ARG 0 biome + METHOD method_23790 (Lnet/minecraft/class_6880;DD)I ARG 1 x ARG 3 z - METHOD method_23791 (Lnet/minecraft/class_1959;DD)I - ARG 0 biome + METHOD method_23791 (Lnet/minecraft/class_6880;DD)I ARG 1 x ARG 3 z METHOD method_4961 getWaterColor (Lnet/minecraft/class_1920;Lnet/minecraft/class_2338;)I diff --git a/mappings/net/minecraft/client/font/GlyphRenderer.mapping b/mappings/net/minecraft/client/font/GlyphRenderer.mapping index 2ecee91372..4406f4d5d5 100644 --- a/mappings/net/minecraft/client/font/GlyphRenderer.mapping +++ b/mappings/net/minecraft/client/font/GlyphRenderer.mapping @@ -22,17 +22,7 @@ CLASS net/minecraft/class_382 net/minecraft/client/font/GlyphRenderer ARG 9 maxX ARG 10 minY ARG 11 maxY - METHOD method_2025 draw (ZFFLorg/joml/Matrix4f;Lnet/minecraft/class_4588;FFFFI)V - ARG 1 italic - ARG 2 x - ARG 3 y - ARG 4 matrix - ARG 5 vertexConsumer - ARG 6 red - ARG 7 green - ARG 8 blue - ARG 9 alpha - ARG 10 light + METHOD method_2025 draw (ZZFFLorg/joml/Matrix4f;Lnet/minecraft/class_4588;FFFFI)V METHOD method_22944 drawRectangle (Lnet/minecraft/class_382$class_328;Lorg/joml/Matrix4f;Lnet/minecraft/class_4588;I)V ARG 1 rectangle ARG 2 matrix diff --git a/mappings/net/minecraft/client/font/TextRenderer.mapping b/mappings/net/minecraft/client/font/TextRenderer.mapping index 345fc91443..ab257c49db 100644 --- a/mappings/net/minecraft/client/font/TextRenderer.mapping +++ b/mappings/net/minecraft/client/font/TextRenderer.mapping @@ -17,20 +17,9 @@ CLASS net/minecraft/class_327 net/minecraft/client/font/TextRenderer METHOD (Ljava/util/function/Function;Z)V ARG 1 fontStorageAccessor ARG 2 validateAdvance - METHOD method_1710 drawGlyph (Lnet/minecraft/class_382;ZZFFFLorg/joml/Matrix4f;Lnet/minecraft/class_4588;FFFFI)V + METHOD method_1710 drawGlyph (Lnet/minecraft/class_382;ZZZFFFLorg/joml/Matrix4f;Lnet/minecraft/class_4588;FFFFI)V ARG 1 glyphRenderer ARG 2 bold - ARG 3 italic - ARG 4 weight - ARG 5 x - ARG 6 y - ARG 7 matrix - ARG 8 vertexConsumer - ARG 9 red - ARG 10 green - ARG 11 blue - ARG 12 alpha - ARG 13 light METHOD method_1712 drawTrimmed (Lnet/minecraft/class_4587;Lnet/minecraft/class_5348;IIII)V ARG 1 matrices ARG 2 text diff --git a/mappings/net/minecraft/client/gl/Framebuffer.mapping b/mappings/net/minecraft/client/gl/Framebuffer.mapping index c071a53b64..acf2382901 100644 --- a/mappings/net/minecraft/client/gl/Framebuffer.mapping +++ b/mappings/net/minecraft/client/gl/Framebuffer.mapping @@ -1,5 +1,4 @@ CLASS net/minecraft/class_276 net/minecraft/client/gl/Framebuffer - FIELD field_1474 depthAttachment I FIELD field_1475 colorAttachment I FIELD field_1476 fbo I FIELD field_1477 viewportHeight I @@ -9,7 +8,7 @@ CLASS net/minecraft/class_276 net/minecraft/client/gl/Framebuffer FIELD field_1481 textureHeight I FIELD field_1482 textureWidth I FIELD field_1483 texFilter I - METHOD (Z)V + METHOD (ZZ)V ARG 1 useDepth METHOD method_1230 clear (Z)V ARG 1 getError diff --git a/mappings/net/minecraft/client/gui/hud/InGameHud.mapping b/mappings/net/minecraft/client/gui/hud/InGameHud.mapping index 08f6f48490..a90c42b699 100644 --- a/mappings/net/minecraft/client/gui/hud/InGameHud.mapping +++ b/mappings/net/minecraft/client/gui/hud/InGameHud.mapping @@ -70,7 +70,7 @@ CLASS net/minecraft/class_329 net/minecraft/client/gui/hud/InGameHud METHOD method_1744 getHeartCount (Lnet/minecraft/class_1309;)I ARG 1 entity METHOD method_1745 resetDebugHudChunk ()V - METHOD method_1746 renderPortalOverlay (Lnet/minecraft/class_4587;F)V + METHOD method_1746 renderPortalOverlay (Lnet/minecraft/class_4587;FZ)V ARG 1 matrices ARG 2 nauseaStrength METHOD method_1747 clear ()V diff --git a/mappings/net/minecraft/client/network/ClientPlayNetworkHandler.mapping b/mappings/net/minecraft/client/network/ClientPlayNetworkHandler.mapping index 3a887ad49b..6c14f80d03 100644 --- a/mappings/net/minecraft/client/network/ClientPlayNetworkHandler.mapping +++ b/mappings/net/minecraft/client/network/ClientPlayNetworkHandler.mapping @@ -34,7 +34,6 @@ CLASS net/minecraft/class_634 net/minecraft/client/network/ClientPlayNetworkHand FIELD field_40799 session Lnet/minecraft/class_7818; FIELD field_42514 queuedPackets Ljava/util/List; METHOD (Lnet/minecraft/class_310;Lnet/minecraft/class_437;Lnet/minecraft/class_2535;Lnet/minecraft/class_642;Lcom/mojang/authlib/GameProfile;Lnet/minecraft/class_7975;)V - ARG 1 client ARG 2 screen ARG 3 connection ARG 4 serverInfo diff --git a/mappings/net/minecraft/client/network/ClientPlayerEntity.mapping b/mappings/net/minecraft/client/network/ClientPlayerEntity.mapping index 009cb3cab4..671cbb7453 100644 --- a/mappings/net/minecraft/client/network/ClientPlayerEntity.mapping +++ b/mappings/net/minecraft/client/network/ClientPlayerEntity.mapping @@ -38,7 +38,6 @@ CLASS net/minecraft/class_746 net/minecraft/client/network/ClientPlayerEntity FIELD field_3944 networkHandler Lnet/minecraft/class_634; FIELD field_3945 activeHand Lnet/minecraft/class_1268; METHOD (Lnet/minecraft/class_310;Lnet/minecraft/class_638;Lnet/minecraft/class_634;Lnet/minecraft/class_3469;Lnet/minecraft/class_299;ZZ)V - ARG 1 client ARG 2 world ARG 3 networkHandler ARG 4 stats diff --git a/mappings/net/minecraft/client/particle/ParticleManager.mapping b/mappings/net/minecraft/client/particle/ParticleManager.mapping index 2a10708b27..edf161a7e4 100644 --- a/mappings/net/minecraft/client/particle/ParticleManager.mapping +++ b/mappings/net/minecraft/client/particle/ParticleManager.mapping @@ -80,13 +80,6 @@ CLASS net/minecraft/class_702 net/minecraft/client/particle/ParticleManager ARG 1 entity ARG 2 parameters METHOD method_3062 registerDefaultFactories ()V - METHOD method_34020 (Lnet/minecraft/class_2338;Lnet/minecraft/class_2680;DDDDDD)V - ARG 3 minX - ARG 5 minY - ARG 7 minZ - ARG 9 maxX - ARG 11 maxY - ARG 13 maxZ METHOD method_34021 canAdd (Lnet/minecraft/class_5878;)Z COMMENT {@return whether another particle from {@code group} can be rendered by this COMMENT manager} diff --git a/mappings/net/minecraft/client/render/BackgroundRenderer.mapping b/mappings/net/minecraft/client/render/BackgroundRenderer.mapping index b97255ed8d..5507dc6fd5 100644 --- a/mappings/net/minecraft/client/render/BackgroundRenderer.mapping +++ b/mappings/net/minecraft/client/render/BackgroundRenderer.mapping @@ -7,7 +7,7 @@ CLASS net/minecraft/class_758 net/minecraft/client/render/BackgroundRenderer FIELD field_4041 nextWaterFogColor I FIELD field_4042 lastWaterFogColorUpdateTime J METHOD method_23792 clearFog ()V - METHOD method_24873 (Lnet/minecraft/class_638;Lnet/minecraft/class_4543;FIII)Lnet/minecraft/class_243; + METHOD method_24873 (Lnet/minecraft/class_4543;Lnet/minecraft/class_638;FIII)Lnet/minecraft/class_243; ARG 3 x ARG 4 y ARG 5 z diff --git a/mappings/net/minecraft/client/render/entity/PlayerEntityRenderer.mapping b/mappings/net/minecraft/client/render/entity/PlayerEntityRenderer.mapping index f5cd616638..3ed328c58f 100644 --- a/mappings/net/minecraft/client/render/entity/PlayerEntityRenderer.mapping +++ b/mappings/net/minecraft/client/render/entity/PlayerEntityRenderer.mapping @@ -9,9 +9,6 @@ CLASS net/minecraft/class_1007 net/minecraft/client/render/entity/PlayerEntityRe ARG 4 player ARG 5 arm ARG 6 sleeve - METHOD method_4210 getArmPose (Lnet/minecraft/class_742;Lnet/minecraft/class_1268;)Lnet/minecraft/class_572$class_573; - ARG 0 player - ARG 1 hand METHOD method_4218 setModelPose (Lnet/minecraft/class_742;)V ARG 1 player METHOD method_4220 renderRightArm (Lnet/minecraft/class_4587;Lnet/minecraft/class_4597;ILnet/minecraft/class_742;)V diff --git a/mappings/net/minecraft/client/render/entity/model/CowEntityModel.mapping b/mappings/net/minecraft/client/render/entity/model/CowEntityModel.mapping index 65d45b7903..c1439537b1 100644 --- a/mappings/net/minecraft/client/render/entity/model/CowEntityModel.mapping +++ b/mappings/net/minecraft/client/render/entity/model/CowEntityModel.mapping @@ -36,5 +36,4 @@ CLASS net/minecraft/class_560 net/minecraft/client/render/entity/model/CowEntity COMMENT METHOD (Lnet/minecraft/class_630;)V ARG 1 root - METHOD method_2800 getHead ()Lnet/minecraft/class_630; METHOD method_31990 getTexturedModelData ()Lnet/minecraft/class_5607; diff --git a/mappings/net/minecraft/client/render/entity/model/MinecartEntityModel.mapping b/mappings/net/minecraft/client/render/entity/model/MinecartEntityModel.mapping index 78419feab4..1226031486 100644 --- a/mappings/net/minecraft/client/render/entity/model/MinecartEntityModel.mapping +++ b/mappings/net/minecraft/client/render/entity/model/MinecartEntityModel.mapping @@ -25,6 +25,4 @@ CLASS net/minecraft/class_580 net/minecraft/client/render/entity/model/MinecartE COMMENT COMMENT FIELD field_27452 root Lnet/minecraft/class_630; - METHOD (Lnet/minecraft/class_630;)V - ARG 1 root METHOD method_32020 getTexturedModelData ()Lnet/minecraft/class_5607; diff --git a/mappings/net/minecraft/client/sound/PositionedSoundInstance.mapping b/mappings/net/minecraft/client/sound/PositionedSoundInstance.mapping index de92d733b2..e1c8c46644 100644 --- a/mappings/net/minecraft/client/sound/PositionedSoundInstance.mapping +++ b/mappings/net/minecraft/client/sound/PositionedSoundInstance.mapping @@ -1,17 +1,4 @@ CLASS net/minecraft/class_1109 net/minecraft/client/sound/PositionedSoundInstance - METHOD (Lnet/minecraft/class_2960;Lnet/minecraft/class_3419;FFLnet/minecraft/class_5819;ZILnet/minecraft/class_1113$class_1114;DDDZ)V - ARG 1 id - ARG 2 category - ARG 3 volume - ARG 4 pitch - ARG 5 random - ARG 6 repeat - ARG 7 repeatDelay - ARG 8 attenuationType - ARG 9 x - ARG 11 y - ARG 13 z - ARG 15 relative METHOD (Lnet/minecraft/class_3414;Lnet/minecraft/class_3419;FFLnet/minecraft/class_5819;DDD)V ARG 1 sound ARG 2 category @@ -40,6 +27,18 @@ CLASS net/minecraft/class_1109 net/minecraft/client/sound/PositionedSoundInstanc ARG 9 x ARG 11 y ARG 13 z + METHOD (Lnet/minecraft/class_3414;Lnet/minecraft/class_3419;FFLnet/minecraft/class_5819;ZILnet/minecraft/class_1113$class_1114;DDDZ)V + ARG 2 category + ARG 3 volume + ARG 4 pitch + ARG 5 random + ARG 6 repeat + ARG 7 repeatDelay + ARG 8 attenuationType + ARG 9 x + ARG 11 y + ARG 13 z + ARG 15 relative METHOD method_24877 ambient (Lnet/minecraft/class_3414;FF)Lnet/minecraft/class_1109; ARG 0 sound ARG 1 pitch diff --git a/mappings/net/minecraft/data/client/BlockStateModelGenerator.mapping b/mappings/net/minecraft/data/client/BlockStateModelGenerator.mapping index 122210acf8..084fe2432e 100644 --- a/mappings/net/minecraft/data/client/BlockStateModelGenerator.mapping +++ b/mappings/net/minecraft/data/client/BlockStateModelGenerator.mapping @@ -29,7 +29,7 @@ CLASS net/minecraft/class_4910 net/minecraft/data/client/BlockStateModelGenerato METHOD method_25520 registerIronBars ()V METHOD method_25521 registerLever ()V METHOD method_25522 registerLilyPad ()V - METHOD method_25523 registerNetherPortal ()V + METHOD method_25523 registerNetherPortal (Lnet/minecraft/class_2248;)V METHOD method_25524 registerNetherrack ()V METHOD method_25525 registerObserver ()V METHOD method_25526 registerPistons ()V diff --git a/mappings/net/minecraft/data/server/recipe/ShapedRecipeJsonBuilder.mapping b/mappings/net/minecraft/data/server/recipe/ShapedRecipeJsonBuilder.mapping index 0371389e2c..a7a5cd26a4 100644 --- a/mappings/net/minecraft/data/server/recipe/ShapedRecipeJsonBuilder.mapping +++ b/mappings/net/minecraft/data/server/recipe/ShapedRecipeJsonBuilder.mapping @@ -8,7 +8,6 @@ CLASS net/minecraft/class_2447 net/minecraft/data/server/recipe/ShapedRecipeJson FIELD field_40645 category Lnet/minecraft/class_7800; FIELD field_42956 showNotification Z METHOD (Lnet/minecraft/class_7800;Lnet/minecraft/class_1935;I)V - ARG 1 category ARG 2 output ARG 3 count METHOD method_10428 input (Ljava/lang/Character;Lnet/minecraft/class_1856;)Lnet/minecraft/class_2447; @@ -43,7 +42,7 @@ CLASS net/minecraft/class_2447 net/minecraft/data/server/recipe/ShapedRecipeJson FIELD field_11389 advancementBuilder Lnet/minecraft/class_161$class_162; FIELD field_11390 advancementId Lnet/minecraft/class_2960; FIELD field_42957 showNotification Z - METHOD (Lnet/minecraft/class_2960;Lnet/minecraft/class_1792;ILjava/lang/String;Lnet/minecraft/class_7710;Ljava/util/List;Ljava/util/Map;Lnet/minecraft/class_161$class_162;Lnet/minecraft/class_2960;Z)V + METHOD (Lnet/minecraft/class_2960;Lnet/minecraft/class_1792;ILjava/lang/String;Lnet/minecraft/class_7710;Ljava/util/List;Ljava/util/Map;Lnet/minecraft/class_161$class_162;Lnet/minecraft/class_2960;ZZZ)V ARG 1 recipeId ARG 2 output ARG 3 resultCount diff --git a/mappings/net/minecraft/entity/Entity.mapping b/mappings/net/minecraft/entity/Entity.mapping index a33024de0d..76e8f5a553 100644 --- a/mappings/net/minecraft/entity/Entity.mapping +++ b/mappings/net/minecraft/entity/Entity.mapping @@ -158,7 +158,6 @@ CLASS net/minecraft/class_1297 net/minecraft/entity/Entity FIELD field_5960 noClip Z FIELD field_5961 type Lnet/minecraft/class_1299; FIELD field_5962 SILENT Lnet/minecraft/class_2940; - FIELD field_5963 inNetherPortal Z FIELD field_5964 fluidHeight Lit/unimi/dsi/fastutil/objects/Object2DoubleMap; FIELD field_5965 pitch F FIELD field_5969 prevZ D @@ -218,7 +217,6 @@ CLASS net/minecraft/class_1297 net/minecraft/entity/Entity FIELD field_6038 lastRenderX D FIELD field_6039 prevHorizontalSpeed F METHOD (Lnet/minecraft/class_1299;Lnet/minecraft/class_1937;)V - ARG 1 type ARG 2 world METHOD equals (Ljava/lang/Object;)Z ARG 1 o @@ -920,7 +918,7 @@ CLASS net/minecraft/class_1297 net/minecraft/entity/Entity ARG 1 tickDelta METHOD method_46395 extinguishWithSound ()V METHOD method_46396 reinitDimensions ()V - METHOD method_48105 teleport (Lnet/minecraft/class_3218;DDDLjava/util/Set;FF)Z + METHOD method_48105 teleport (Lnet/minecraft/class_3218;DDDLjava/util/Set;FF)Lnet/minecraft/class_1297; COMMENT Teleports the entity to the given position. If {@code world} differs from COMMENT the current world, it copies the entity and discards the current one. COMMENT @@ -1437,7 +1435,7 @@ CLASS net/minecraft/class_1297 net/minecraft/entity/Entity ARG 1 entityKilled ARG 2 score ARG 3 damageSource - METHOD method_5717 setInNetherPortal (Lnet/minecraft/class_2338;)V + METHOD method_5717 setInNetherPortal (Lnet/minecraft/class_2338;Z)V ARG 1 pos METHOD method_5718 getBrightnessAtEyes ()F METHOD method_5719 copyPositionAndRotation (Lnet/minecraft/class_1297;)V @@ -2277,6 +2275,7 @@ CLASS net/minecraft/class_1297 net/minecraft/entity/Entity COMMENT {@return whether the entity is a spectator} COMMENT COMMENT

This returns {@code false} unless the entity is a player in spectator game mode. + METHOD method_7490 getGravity ()F CLASS class_4738 PositionUpdater METHOD accept (Lnet/minecraft/class_1297;DDD)V ARG 1 entity diff --git a/mappings/net/minecraft/entity/ItemEntity.mapping b/mappings/net/minecraft/entity/ItemEntity.mapping index b1e143782b..a749b622f6 100644 --- a/mappings/net/minecraft/entity/ItemEntity.mapping +++ b/mappings/net/minecraft/entity/ItemEntity.mapping @@ -70,7 +70,7 @@ CLASS net/minecraft/class_1542 net/minecraft/entity/ItemEntity METHOD method_6979 setStack (Lnet/minecraft/class_1799;)V COMMENT Sets the item stack contained in this item entity to {@code stack}. ARG 1 stack - METHOD method_6981 setThrower (Ljava/util/UUID;)V + METHOD method_6981 setThrower (Ljava/util/UUID;Z)V COMMENT Sets the thrower of this item entity to {@code thrower}. ARG 1 thrower METHOD method_6982 setPickupDelay (I)V diff --git a/mappings/net/minecraft/entity/LivingEntity.mapping b/mappings/net/minecraft/entity/LivingEntity.mapping index ff369dadd7..cf853b0ed7 100644 --- a/mappings/net/minecraft/entity/LivingEntity.mapping +++ b/mappings/net/minecraft/entity/LivingEntity.mapping @@ -371,7 +371,7 @@ CLASS net/minecraft/class_1309 net/minecraft/entity/LivingEntity METHOD method_6000 enterCombat ()V METHOD method_6002 getDeathSound ()Lnet/minecraft/class_3414; METHOD method_6003 getRoll ()I - METHOD method_6005 takeKnockback (DDD)V + METHOD method_6005 takeKnockback (DDDZ)V ARG 1 strength ARG 3 x ARG 5 z diff --git a/mappings/net/minecraft/entity/ai/brain/WalkTarget.mapping b/mappings/net/minecraft/entity/ai/brain/WalkTarget.mapping index 4ac19195f1..f5d314899c 100644 --- a/mappings/net/minecraft/entity/ai/brain/WalkTarget.mapping +++ b/mappings/net/minecraft/entity/ai/brain/WalkTarget.mapping @@ -3,7 +3,6 @@ CLASS net/minecraft/class_4142 net/minecraft/entity/ai/brain/WalkTarget FIELD field_18461 speed F FIELD field_18462 completionRange I METHOD (Lnet/minecraft/class_1297;FI)V - ARG 1 entity ARG 2 speed ARG 3 completionRange METHOD (Lnet/minecraft/class_2338;FI)V @@ -15,7 +14,6 @@ CLASS net/minecraft/class_4142 net/minecraft/entity/ai/brain/WalkTarget ARG 2 speed ARG 3 completionRange METHOD (Lnet/minecraft/class_4115;FI)V - ARG 1 lookTarget ARG 2 speed ARG 3 completionRange METHOD method_19094 getLookTarget ()Lnet/minecraft/class_4115; diff --git a/mappings/net/minecraft/entity/ai/brain/task/CelebrateRaidWinTask.mapping b/mappings/net/minecraft/entity/ai/brain/task/CelebrateRaidWinTask.mapping index 9f3d017c35..5755f94fc2 100644 --- a/mappings/net/minecraft/entity/ai/brain/task/CelebrateRaidWinTask.mapping +++ b/mappings/net/minecraft/entity/ai/brain/task/CelebrateRaidWinTask.mapping @@ -3,6 +3,4 @@ CLASS net/minecraft/class_4242 net/minecraft/entity/ai/brain/task/CelebrateRaidW METHOD (II)V ARG 1 minRunTime ARG 2 maxRunTime - METHOD method_19950 createFirework (Lnet/minecraft/class_1767;I)Lnet/minecraft/class_1799; - ARG 1 color - ARG 2 flight + METHOD method_19950 createFirework (II[I)Lnet/minecraft/class_1799; diff --git a/mappings/net/minecraft/entity/ai/goal/ActiveTargetGoal.mapping b/mappings/net/minecraft/entity/ai/goal/ActiveTargetGoal.mapping index 4508810334..19f9233e67 100644 --- a/mappings/net/minecraft/entity/ai/goal/ActiveTargetGoal.mapping +++ b/mappings/net/minecraft/entity/ai/goal/ActiveTargetGoal.mapping @@ -6,15 +6,7 @@ CLASS net/minecraft/class_1400 net/minecraft/entity/ai/goal/ActiveTargetGoal COMMENT when this goal is not started. This is also the average number of ticks COMMENT between each search (as in a poisson distribution). FIELD field_6642 targetPredicate Lnet/minecraft/class_4051; - FIELD field_6643 targetClass Ljava/lang/Class; FIELD field_6644 targetEntity Lnet/minecraft/class_1309; - METHOD (Lnet/minecraft/class_1308;Ljava/lang/Class;IZZLjava/util/function/Predicate;)V - ARG 1 mob - ARG 2 targetClass - ARG 3 reciprocalChance - ARG 4 checkVisibility - ARG 5 checkCanNavigate - ARG 6 targetPredicate METHOD (Lnet/minecraft/class_1308;Ljava/lang/Class;Z)V ARG 1 mob ARG 2 targetClass @@ -29,6 +21,12 @@ CLASS net/minecraft/class_1400 net/minecraft/entity/ai/goal/ActiveTargetGoal ARG 2 targetClass ARG 3 checkVisibility ARG 4 checkCanNavigate + METHOD (Lnet/minecraft/class_1308;Ljava/util/function/Predicate;IZZLjava/util/function/Predicate;)V + ARG 1 mob + ARG 3 reciprocalChance + ARG 4 checkVisibility + ARG 5 checkCanNavigate + ARG 6 targetPredicate METHOD method_18415 findClosestTarget ()V METHOD method_24632 setTargetEntity (Lnet/minecraft/class_1309;)V ARG 1 targetEntity diff --git a/mappings/net/minecraft/entity/ai/goal/WanderAroundGoal.mapping b/mappings/net/minecraft/entity/ai/goal/WanderAroundGoal.mapping index 5e5f7ba309..782baf51ee 100644 --- a/mappings/net/minecraft/entity/ai/goal/WanderAroundGoal.mapping +++ b/mappings/net/minecraft/entity/ai/goal/WanderAroundGoal.mapping @@ -16,7 +16,6 @@ CLASS net/minecraft/class_1379 net/minecraft/entity/ai/goal/WanderAroundGoal ARG 2 speed ARG 4 chance METHOD (Lnet/minecraft/class_1314;DIZ)V - ARG 1 entity ARG 2 speed ARG 4 chance ARG 5 canDespawn diff --git a/mappings/net/minecraft/entity/mob/EndermanEntity.mapping b/mappings/net/minecraft/entity/mob/EndermanEntity.mapping index 6e82316b57..8b837c9f0a 100644 --- a/mappings/net/minecraft/entity/mob/EndermanEntity.mapping +++ b/mappings/net/minecraft/entity/mob/EndermanEntity.mapping @@ -16,7 +16,7 @@ CLASS net/minecraft/class_1560 net/minecraft/entity/mob/EndermanEntity ARG 1 source ARG 2 potion ARG 3 amount - METHOD method_7024 teleportTo (DDD)Z + METHOD method_7024 teleportTo (Lnet/minecraft/class_1309;DDD)Z ARG 1 x ARG 3 y ARG 5 z diff --git a/mappings/net/minecraft/entity/mob/MobEntity.mapping b/mappings/net/minecraft/entity/mob/MobEntity.mapping index b86469a237..2f4da04f47 100644 --- a/mappings/net/minecraft/entity/mob/MobEntity.mapping +++ b/mappings/net/minecraft/entity/mob/MobEntity.mapping @@ -227,7 +227,6 @@ CLASS net/minecraft/class_1308 net/minecraft/entity/mob/MobEntity ARG 1 count METHOD method_5970 getMinAmbientSoundDelay ()I METHOD method_5971 setPersistent ()V - METHOD method_5972 isAffectedByDaylight ()Z METHOD method_5974 canImmediatelyDespawn (D)Z ARG 1 distanceSquared METHOD method_5975 resetSoundDelay ()V diff --git a/mappings/net/minecraft/entity/player/PlayerEntity.mapping b/mappings/net/minecraft/entity/player/PlayerEntity.mapping index c06934cf20..6d4185721e 100644 --- a/mappings/net/minecraft/entity/player/PlayerEntity.mapping +++ b/mappings/net/minecraft/entity/player/PlayerEntity.mapping @@ -199,7 +199,6 @@ CLASS net/minecraft/class_1657 net/minecraft/entity/player/PlayerEntity METHOD method_7298 addShoulderEntity (Lnet/minecraft/class_2487;)Z ARG 1 entityNbt METHOD method_7299 addTellClickEvent (Lnet/minecraft/class_5250;)Lnet/minecraft/class_5250; - ARG 1 component METHOD method_7302 hasReducedDebugInfo ()Z METHOD method_7303 openStructureBlockScreen (Lnet/minecraft/class_2633;)V ARG 1 structureBlock @@ -278,7 +277,6 @@ CLASS net/minecraft/class_1657 net/minecraft/entity/player/PlayerEntity ARG 2 amount METHOD method_7340 isMainPlayer ()Z METHOD method_7341 collideWithEntity (Lnet/minecraft/class_1297;)V - ARG 1 entity METHOD method_7342 increaseStat (Lnet/minecraft/class_3445;I)V ARG 1 stat ARG 2 amount diff --git a/mappings/net/minecraft/entity/projectile/thrown/ThrownEntity.mapping b/mappings/net/minecraft/entity/projectile/thrown/ThrownEntity.mapping index 9d483cf2f1..35c93a68e6 100644 --- a/mappings/net/minecraft/entity/projectile/thrown/ThrownEntity.mapping +++ b/mappings/net/minecraft/entity/projectile/thrown/ThrownEntity.mapping @@ -9,4 +9,3 @@ CLASS net/minecraft/class_1682 net/minecraft/entity/projectile/thrown/ThrownEnti ARG 1 type ARG 2 owner ARG 3 world - METHOD method_7490 getGravity ()F diff --git a/mappings/net/minecraft/item/FlintAndSteelItem.mapping b/mappings/net/minecraft/item/FlintAndSteelItem.mapping index 936ddb58f4..dc08e5e569 100644 --- a/mappings/net/minecraft/item/FlintAndSteelItem.mapping +++ b/mappings/net/minecraft/item/FlintAndSteelItem.mapping @@ -1,5 +1,3 @@ CLASS net/minecraft/class_1786 net/minecraft/item/FlintAndSteelItem - METHOD method_20276 (Lnet/minecraft/class_1838;Lnet/minecraft/class_1657;)V - ARG 1 p METHOD method_20277 (Lnet/minecraft/class_1838;Lnet/minecraft/class_1657;)V ARG 1 p diff --git a/mappings/net/minecraft/item/FoodComponent.mapping b/mappings/net/minecraft/item/FoodComponent.mapping index 1f6125161f..dcdcda404b 100644 --- a/mappings/net/minecraft/item/FoodComponent.mapping +++ b/mappings/net/minecraft/item/FoodComponent.mapping @@ -6,7 +6,7 @@ CLASS net/minecraft/class_4174 net/minecraft/item/FoodComponent FIELD field_18617 alwaysEdible Z FIELD field_18618 snack Z FIELD field_18619 statusEffects Ljava/util/List; - METHOD (IFZZZLjava/util/List;)V + METHOD (IFZZZLjava/util/List;Ljava/util/function/BiConsumer;)V ARG 1 hunger ARG 2 saturationModifier ARG 3 meat diff --git a/mappings/net/minecraft/item/ItemStack.mapping b/mappings/net/minecraft/item/ItemStack.mapping index 10128ee435..18accadada 100644 --- a/mappings/net/minecraft/item/ItemStack.mapping +++ b/mappings/net/minecraft/item/ItemStack.mapping @@ -255,9 +255,6 @@ CLASS net/minecraft/class_1799 net/minecraft/item/ItemStack METHOD method_7912 setBobbingAnimationTime (I)V ARG 1 bobbingAnimationTime METHOD method_7913 use (Lnet/minecraft/class_1937;Lnet/minecraft/class_1657;Lnet/minecraft/class_1268;)Lnet/minecraft/class_1271; - ARG 1 world - ARG 2 user - ARG 3 hand METHOD method_7914 getMaxCount ()I METHOD method_7915 fromNbt (Lnet/minecraft/class_2487;)Lnet/minecraft/class_1799; COMMENT {@return the item stack deserialized from the NBT, or {@link #EMPTY} if diff --git a/mappings/net/minecraft/network/PacketByteBuf.mapping b/mappings/net/minecraft/network/PacketByteBuf.mapping index e762aa7cf6..7a531854a4 100644 --- a/mappings/net/minecraft/network/PacketByteBuf.mapping +++ b/mappings/net/minecraft/network/PacketByteBuf.mapping @@ -347,7 +347,7 @@ CLASS net/minecraft/class_2540 net/minecraft/network/PacketByteBuf COMMENT @see #readItemStack() ARG 1 stack COMMENT the stack to write - METHOD method_10794 writeNbt (Lnet/minecraft/class_2487;)Lnet/minecraft/class_2540; + METHOD method_10794 writeNbt (Lnet/minecraft/class_2520;)Lnet/minecraft/class_2540; COMMENT Writes an NBT compound to this buf. The binary representation of NBT is COMMENT handled by {@link net.minecraft.nbt.NbtIo}. If {@code compound} is {@code COMMENT null}, it is treated as an NBT null. @@ -358,8 +358,6 @@ CLASS net/minecraft/class_2540 net/minecraft/network/PacketByteBuf COMMENT @see #readNbt() COMMENT @see #readUnlimitedNbt() COMMENT @see #readNbt(NbtTagSizeTracker) - ARG 1 compound - COMMENT the compound to write METHOD method_10795 readByteArray ()[B COMMENT Reads an array of primitive bytes from this buf. The array first has a COMMENT var int indicating its length, followed by the actual bytes. The array @@ -665,7 +663,7 @@ CLASS net/minecraft/class_2540 net/minecraft/network/PacketByteBuf ARG 1 ops ARG 2 codec ARG 3 value - METHOD method_30616 readNbt (Lnet/minecraft/class_2505;)Lnet/minecraft/class_2487; + METHOD method_30616 readNbt (Lnet/minecraft/class_2505;)Lnet/minecraft/class_2520; COMMENT Reads an NBT compound from this buf. The binary representation of NBT is COMMENT handled by {@link net.minecraft.nbt.NbtIo}. If an NBT null is encountered, COMMENT this method returns {@code null}. The compound can have a maximum size @@ -812,7 +810,7 @@ CLASS net/minecraft/class_2540 net/minecraft/network/PacketByteBuf COMMENT a factory that creates a map with a given size ARG 2 keyReader ARG 3 valueReader - METHOD method_34070 (Lnet/minecraft/class_2487;Ljava/lang/String;)Lio/netty/handler/codec/DecoderException; + METHOD method_34070 (Lnet/minecraft/class_2520;Ljava/lang/String;)Lio/netty/handler/codec/DecoderException; ARG 1 error METHOD method_36129 getVarLongLength (J)I COMMENT Returns the number of bytes needed to encode {@code value} as a diff --git a/mappings/net/minecraft/network/packet/s2c/play/HealthUpdateS2CPacket.mapping b/mappings/net/minecraft/network/packet/s2c/play/HealthUpdateS2CPacket.mapping index 47bbbfd757..5c4a93dc83 100644 --- a/mappings/net/minecraft/network/packet/s2c/play/HealthUpdateS2CPacket.mapping +++ b/mappings/net/minecraft/network/packet/s2c/play/HealthUpdateS2CPacket.mapping @@ -2,7 +2,7 @@ CLASS net/minecraft/class_2749 net/minecraft/network/packet/s2c/play/HealthUpdat FIELD field_12583 saturation F FIELD field_12584 health F FIELD field_12585 food I - METHOD (FIF)V + METHOD (FIFI)V ARG 1 health ARG 2 food ARG 3 saturation diff --git a/mappings/net/minecraft/recipe/RecipeManager.mapping b/mappings/net/minecraft/recipe/RecipeManager.mapping index c4c161a465..bf50a364cd 100644 --- a/mappings/net/minecraft/recipe/RecipeManager.mapping +++ b/mappings/net/minecraft/recipe/RecipeManager.mapping @@ -73,8 +73,6 @@ CLASS net/minecraft/class_1863 net/minecraft/recipe/RecipeManager METHOD method_35227 isErrored ()Z COMMENT {@return the {@link #errored} field} This is unused in vanilla and will only COMMENT return {@code false} without mods. - METHOD method_42297 (Lnet/minecraft/class_1263;Lnet/minecraft/class_1937;Lnet/minecraft/class_1860;)Z - ARG 2 recipe METHOD method_42298 (Lnet/minecraft/class_1263;Lnet/minecraft/class_1937;Ljava/util/Map$Entry;)Z ARG 2 entry METHOD method_42299 getFirstMatch (Lnet/minecraft/class_3956;Lnet/minecraft/class_1263;Lnet/minecraft/class_1937;Lnet/minecraft/class_2960;)Ljava/util/Optional; @@ -84,8 +82,6 @@ CLASS net/minecraft/class_1863 net/minecraft/recipe/RecipeManager ARG 4 id METHOD method_42300 (Ljava/util/Map$Entry;)Lcom/mojang/datafixers/util/Pair; ARG 0 entry - METHOD method_42301 (Lnet/minecraft/class_1263;Lnet/minecraft/class_1937;Lnet/minecraft/class_1860;)Z - ARG 2 recipe METHOD method_42302 createCachedMatchGetter (Lnet/minecraft/class_3956;)Lnet/minecraft/class_1863$class_7266; COMMENT Creates a cached match getter. This is optimized for getting matches of the same COMMENT recipe repeatedly, such as furnaces. diff --git a/mappings/net/minecraft/recipe/ShapedRecipe.mapping b/mappings/net/minecraft/recipe/ShapedRecipe.mapping index e8ec0eb59a..37aededa33 100644 --- a/mappings/net/minecraft/recipe/ShapedRecipe.mapping +++ b/mappings/net/minecraft/recipe/ShapedRecipe.mapping @@ -15,7 +15,7 @@ CLASS net/minecraft/class_1869 net/minecraft/recipe/ShapedRecipe ARG 5 height ARG 6 input ARG 7 output - METHOD (Lnet/minecraft/class_2960;Ljava/lang/String;Lnet/minecraft/class_7710;IILnet/minecraft/class_2371;Lnet/minecraft/class_1799;Z)V + METHOD (Lnet/minecraft/class_2960;Ljava/lang/String;Lnet/minecraft/class_7710;IILnet/minecraft/class_2371;Lnet/minecraft/class_1799;ZZZ)V ARG 1 id ARG 2 group ARG 3 category diff --git a/mappings/net/minecraft/server/network/ServerPlayNetworkHandler.mapping b/mappings/net/minecraft/server/network/ServerPlayNetworkHandler.mapping index 7423da7488..4543556405 100644 --- a/mappings/net/minecraft/server/network/ServerPlayNetworkHandler.mapping +++ b/mappings/net/minecraft/server/network/ServerPlayNetworkHandler.mapping @@ -32,7 +32,7 @@ CLASS net/minecraft/class_3244 net/minecraft/server/network/ServerPlayNetworkHan FIELD field_14147 topmostRiddenEntity Lnet/minecraft/class_1297; FIELD field_14148 server Lnet/minecraft/server/MinecraftServer; FIELD field_29778 KEEP_ALIVE_INTERVAL I - FIELD field_37280 MAX_BREAK_SQUARED_DISTANCE D + FIELD field_37280 MAX_BREAK_SQUARED_DISTANCE F FIELD field_37281 DEFAULT_SEQUENCE I FIELD field_37282 sequence I FIELD field_39394 lastMessageTimestamp Ljava/util/concurrent/atomic/AtomicReference; diff --git a/mappings/net/minecraft/text/Style.mapping b/mappings/net/minecraft/text/Style.mapping index ce7348f12c..d8090590ce 100644 --- a/mappings/net/minecraft/text/Style.mapping +++ b/mappings/net/minecraft/text/Style.mapping @@ -20,7 +20,7 @@ CLASS net/minecraft/class_2583 net/minecraft/text/Style COMMENT An empty style. FIELD field_24361 font Lnet/minecraft/class_2960; FIELD field_39241 CODEC Lcom/mojang/serialization/Codec; - METHOD (Lnet/minecraft/class_5251;Ljava/lang/Boolean;Ljava/lang/Boolean;Ljava/lang/Boolean;Ljava/lang/Boolean;Ljava/lang/Boolean;Lnet/minecraft/class_2558;Lnet/minecraft/class_2568;Ljava/lang/String;Lnet/minecraft/class_2960;)V + METHOD (Lnet/minecraft/class_5251;Ljava/lang/Boolean;Ljava/lang/Boolean;Ljava/lang/Boolean;Ljava/lang/Boolean;Ljava/lang/Boolean;Lnet/minecraft/class_2558;Lnet/minecraft/class_2568;Ljava/lang/String;Lnet/minecraft/class_2960;Ljava/lang/Boolean;)V ARG 1 color ARG 2 bold ARG 3 italic @@ -146,7 +146,7 @@ CLASS net/minecraft/class_2583 net/minecraft/text/Style ARG 1 obfuscated METHOD method_43869 (Lcom/mojang/serialization/codecs/RecordCodecBuilder$Instance;)Lcom/mojang/datafixers/kinds/App; ARG 0 instance - METHOD method_43870 of (Ljava/util/Optional;Ljava/util/Optional;Ljava/util/Optional;Ljava/util/Optional;Ljava/util/Optional;Ljava/util/Optional;Ljava/util/Optional;Ljava/util/Optional;)Lnet/minecraft/class_2583; + METHOD method_43870 of (Ljava/util/Optional;Ljava/util/Optional;Ljava/util/Optional;Ljava/util/Optional;Ljava/util/Optional;Ljava/util/Optional;Ljava/util/Optional;Ljava/util/Optional;Ljava/util/Optional;)Lnet/minecraft/class_2583; ARG 0 color ARG 1 bold ARG 2 italic diff --git a/mappings/net/minecraft/unused/packageinfo/PackageInfo8263.mapping b/mappings/net/minecraft/unused/packageinfo/PackageInfo8263.mapping new file mode 100644 index 0000000000..8f6a22ac8d --- /dev/null +++ b/mappings/net/minecraft/unused/packageinfo/PackageInfo8263.mapping @@ -0,0 +1 @@ +CLASS net/minecraft/class_8263 net/minecraft/unused/packageinfo/PackageInfo8263 diff --git a/mappings/net/minecraft/unused/packageinfo/PackageInfo8365.mapping b/mappings/net/minecraft/unused/packageinfo/PackageInfo8365.mapping new file mode 100644 index 0000000000..859e7039d3 --- /dev/null +++ b/mappings/net/minecraft/unused/packageinfo/PackageInfo8365.mapping @@ -0,0 +1 @@ +CLASS net/minecraft/class_8365 net/minecraft/unused/packageinfo/PackageInfo8365 diff --git a/mappings/net/minecraft/unused/packageinfo/PackageInfo8366.mapping b/mappings/net/minecraft/unused/packageinfo/PackageInfo8366.mapping new file mode 100644 index 0000000000..af2354222e --- /dev/null +++ b/mappings/net/minecraft/unused/packageinfo/PackageInfo8366.mapping @@ -0,0 +1 @@ +CLASS net/minecraft/class_8366 net/minecraft/unused/packageinfo/PackageInfo8366 diff --git a/mappings/net/minecraft/unused/packageinfo/PackageInfo8396.mapping b/mappings/net/minecraft/unused/packageinfo/PackageInfo8396.mapping new file mode 100644 index 0000000000..ead2179823 --- /dev/null +++ b/mappings/net/minecraft/unused/packageinfo/PackageInfo8396.mapping @@ -0,0 +1 @@ +CLASS net/minecraft/class_8396 net/minecraft/unused/packageinfo/PackageInfo8396 diff --git a/mappings/net/minecraft/unused/packageinfo/PackageInfo8412.mapping b/mappings/net/minecraft/unused/packageinfo/PackageInfo8412.mapping new file mode 100644 index 0000000000..e66234efbc --- /dev/null +++ b/mappings/net/minecraft/unused/packageinfo/PackageInfo8412.mapping @@ -0,0 +1 @@ +CLASS net/minecraft/class_8412 net/minecraft/unused/packageinfo/PackageInfo8412 diff --git a/mappings/net/minecraft/unused/packageinfo/PackageInfo8453.mapping b/mappings/net/minecraft/unused/packageinfo/PackageInfo8453.mapping new file mode 100644 index 0000000000..dbe6a8052a --- /dev/null +++ b/mappings/net/minecraft/unused/packageinfo/PackageInfo8453.mapping @@ -0,0 +1 @@ +CLASS net/minecraft/class_8453 net/minecraft/unused/packageinfo/PackageInfo8453 diff --git a/mappings/net/minecraft/unused/packageinfo/PackageInfo8476.mapping b/mappings/net/minecraft/unused/packageinfo/PackageInfo8476.mapping new file mode 100644 index 0000000000..a6766ccca0 --- /dev/null +++ b/mappings/net/minecraft/unused/packageinfo/PackageInfo8476.mapping @@ -0,0 +1 @@ +CLASS net/minecraft/class_8476 net/minecraft/unused/packageinfo/PackageInfo8476 diff --git a/mappings/net/minecraft/util/StringHelper.mapping b/mappings/net/minecraft/util/StringHelper.mapping index 1ac5366114..1f76a702fb 100644 --- a/mappings/net/minecraft/util/StringHelper.mapping +++ b/mappings/net/minecraft/util/StringHelper.mapping @@ -6,10 +6,9 @@ CLASS net/minecraft/class_3544 net/minecraft/util/StringHelper METHOD method_15438 isEmpty (Ljava/lang/String;)Z COMMENT {@return true if {@code text} is {@code null} or empty, false otherwise} ARG 0 text - METHOD method_15439 formatTicks (I)Ljava/lang/String; + METHOD method_15439 formatTicks (J)Ljava/lang/String; COMMENT {@return the length of the {@code tick} in the MM:SS format, where COMMENT the MM is the minutes and SS is the seconds (optionally zero-padded)} - ARG 0 ticks METHOD method_15440 stripTextFormat (Ljava/lang/String;)Ljava/lang/String; COMMENT {@return the {@code text} with all formatting codes removed} COMMENT diff --git a/mappings/net/minecraft/util/Util.mapping b/mappings/net/minecraft/util/Util.mapping index be89e590f3..9f561cfa9c 100644 --- a/mappings/net/minecraft/util/Util.mapping +++ b/mappings/net/minecraft/util/Util.mapping @@ -210,9 +210,8 @@ CLASS net/minecraft/class_156 net/minecraft/util/Util COMMENT {@return the contents of {@code stream} copied to a list and then shuffled} ARG 0 list ARG 1 random - METHOD method_43028 shuffle (Lit/unimi/dsi/fastutil/objects/ObjectArrayList;Lnet/minecraft/class_5819;)V + METHOD method_43028 shuffle (Ljava/util/List;Lnet/minecraft/class_5819;)V COMMENT Shuffles {@code list}, modifying the passed list in place. - ARG 0 list ARG 1 random METHOD method_43251 shuffle (Ljava/util/stream/IntStream;Lnet/minecraft/class_5819;)Lit/unimi/dsi/fastutil/ints/IntArrayList; COMMENT {@return the contents of {@code stream} copied to a list and then shuffled} diff --git a/mappings/net/minecraft/village/TradeOffers.mapping b/mappings/net/minecraft/village/TradeOffers.mapping index cf6327b929..5ed1aa1354 100644 --- a/mappings/net/minecraft/village/TradeOffers.mapping +++ b/mappings/net/minecraft/village/TradeOffers.mapping @@ -25,7 +25,7 @@ CLASS net/minecraft/class_3853 net/minecraft/village/TradeOffers ARG 1 experience CLASS class_1652 Factory COMMENT A factory to create trade offers. - METHOD method_7246 create (Lnet/minecraft/class_1297;Lnet/minecraft/class_5819;)Lnet/minecraft/class_1914; + METHOD method_7246 create (Lnet/minecraft/class_1297;Lnet/minecraft/class_5819;Lnet/minecraft/class_1792;)Lnet/minecraft/class_1914; COMMENT Creates a trade offer. COMMENT COMMENT @return a new trade offer, or {@code null} if none should be created diff --git a/mappings/net/minecraft/world/World.mapping b/mappings/net/minecraft/world/World.mapping index cf48b738d4..4cbcb189cc 100644 --- a/mappings/net/minecraft/world/World.mapping +++ b/mappings/net/minecraft/world/World.mapping @@ -37,8 +37,6 @@ CLASS net/minecraft/class_1937 net/minecraft/world/World ARG 1 properties ARG 2 registryRef ARG 3 registryManager - ARG 4 dimensionEntry - ARG 5 profiler ARG 6 isClient ARG 7 debugWorld ARG 8 biomeAccess diff --git a/mappings/net/minecraft/world/biome/Biome.mapping b/mappings/net/minecraft/world/biome/Biome.mapping index 18b3f3f5c8..85b9bf3974 100644 --- a/mappings/net/minecraft/world/biome/Biome.mapping +++ b/mappings/net/minecraft/world/biome/Biome.mapping @@ -19,7 +19,7 @@ CLASS net/minecraft/class_1959 net/minecraft/world/biome/Biome ARG 4 spawnSettings METHOD method_21740 getTemperature (Lnet/minecraft/class_2338;)F ARG 1 blockPos - METHOD method_24376 getFogColor ()I + METHOD method_24376 getFogColor (Lnet/minecraft/class_6880;)I METHOD method_24377 getEffects ()Lnet/minecraft/class_4763; METHOD method_24378 getParticleConfig ()Ljava/util/Optional; METHOD method_24935 getLoopSound ()Ljava/util/Optional; @@ -62,22 +62,20 @@ CLASS net/minecraft/class_1959 net/minecraft/world/biome/Biome ARG 1 world ARG 2 pos ARG 3 doWaterCheck - METHOD method_8687 getWaterColor ()I + METHOD method_8687 getWaterColor (Lnet/minecraft/class_6880;)I METHOD method_8696 canSetSnow (Lnet/minecraft/class_4538;Lnet/minecraft/class_2338;)Z ARG 1 world ARG 2 pos - METHOD method_8697 getSkyColor ()I - METHOD method_8698 getFoliageColor ()I + METHOD method_8697 getSkyColor (Lnet/minecraft/class_6880;)I + METHOD method_8698 getFoliageColor (Lnet/minecraft/class_6880;)I METHOD method_8705 canSetIce (Lnet/minecraft/class_4538;Lnet/minecraft/class_2338;)Z ARG 1 world ARG 2 blockPos METHOD method_8707 computeTemperature (Lnet/minecraft/class_2338;)F ARG 1 pos - METHOD method_8711 getGrassColorAt (DD)I - ARG 1 x - ARG 3 z + METHOD method_8711 getGrassColorAt (Lnet/minecraft/class_6880;DD)I METHOD method_8712 getTemperature ()F - METHOD method_8713 getWaterFogColor ()I + METHOD method_8713 getWaterFogColor (Lnet/minecraft/class_6880;)I CLASS 1 METHOD rehash (I)V ARG 1 n diff --git a/mappings/net/minecraft/world/biome/ColorResolver.mapping b/mappings/net/minecraft/world/biome/ColorResolver.mapping index 20da3c1dbe..b42a07bd2d 100644 --- a/mappings/net/minecraft/world/biome/ColorResolver.mapping +++ b/mappings/net/minecraft/world/biome/ColorResolver.mapping @@ -1,5 +1,4 @@ CLASS net/minecraft/class_6539 net/minecraft/world/biome/ColorResolver - METHOD getColor (Lnet/minecraft/class_1959;DD)I - ARG 1 biome + METHOD getColor (Lnet/minecraft/class_6880;DD)I ARG 2 x ARG 4 z diff --git a/mappings/net/minecraft/world/dimension/NetherPortal.mapping b/mappings/net/minecraft/world/dimension/NetherPortal.mapping index 4ffc4c65ad..31729284e0 100644 --- a/mappings/net/minecraft/world/dimension/NetherPortal.mapping +++ b/mappings/net/minecraft/world/dimension/NetherPortal.mapping @@ -6,17 +6,14 @@ CLASS net/minecraft/class_2424 net/minecraft/world/dimension/NetherPortal FIELD field_11316 lowerCorner Lnet/minecraft/class_2338; FIELD field_11317 axis Lnet/minecraft/class_2350$class_2351; FIELD field_11318 world Lnet/minecraft/class_1936; - FIELD field_25883 IS_VALID_FRAME_BLOCK Lnet/minecraft/class_4970$class_4973; FIELD field_31823 MAX_WIDTH I FIELD field_31825 MIN_WIDTH I FIELD field_41086 FALLBACK_THRESHOLD F FIELD field_41087 HEIGHT_STRETCH D - METHOD (Lnet/minecraft/class_1936;Lnet/minecraft/class_2338;Lnet/minecraft/class_2350$class_2351;)V - ARG 1 world + METHOD (Lnet/minecraft/class_1936;Lnet/minecraft/class_2338;Lnet/minecraft/class_2350$class_2351;Z)V ARG 2 pos ARG 3 axis METHOD method_10359 validStateInsidePortal (Lnet/minecraft/class_2680;)Z - ARG 0 state METHOD method_10360 isValid ()Z METHOD method_10362 wasAlreadyValid ()Z METHOD method_10363 createPortal ()V @@ -32,19 +29,15 @@ CLASS net/minecraft/class_2424 net/minecraft/world/dimension/NetherPortal ARG 5 velocity ARG 6 yaw ARG 7 pitch - METHOD method_30485 getNewPortal (Lnet/minecraft/class_1936;Lnet/minecraft/class_2338;Lnet/minecraft/class_2350$class_2351;)Ljava/util/Optional; + METHOD method_30485 getNewPortal (Lnet/minecraft/class_1936;Lnet/minecraft/class_2338;Lnet/minecraft/class_2350$class_2351;Z)Ljava/util/Optional; ARG 0 world ARG 1 pos ARG 2 axis - METHOD method_30486 getOrEmpty (Lnet/minecraft/class_1936;Lnet/minecraft/class_2338;Ljava/util/function/Predicate;Lnet/minecraft/class_2350$class_2351;)Ljava/util/Optional; + METHOD method_30486 getOrEmpty (Lnet/minecraft/class_1936;Lnet/minecraft/class_2338;Ljava/util/function/Predicate;Lnet/minecraft/class_2350$class_2351;Z)Ljava/util/Optional; ARG 0 world ARG 1 pos ARG 2 validator ARG 3 axis - METHOD method_30487 (Lnet/minecraft/class_2680;Lnet/minecraft/class_1922;Lnet/minecraft/class_2338;)Z - ARG 0 state - ARG 1 world - ARG 2 pos METHOD method_30489 (Lnet/minecraft/class_2424;)Z ARG 0 areaHelper METHOD method_30490 getPotentialHeight (Lnet/minecraft/class_2338$class_2339;)I