diff --git a/build.gradle b/build.gradle index b7a8413bbd..9af8fbd12e 100644 --- a/build.gradle +++ b/build.gradle @@ -23,7 +23,7 @@ plugins { id 'java' // for jd gen } -def minecraft_version = "20w51a" +def minecraft_version = "21w03a" def ENV = System.getenv() // Fetch build number from Github Actions diff --git a/mappings/net/minecraft/block/entity/ShulkerBoxBlockEntity.mapping b/mappings/net/minecraft/block/entity/ShulkerBoxBlockEntity.mapping index 6606966ef7..583a4d088c 100644 --- a/mappings/net/minecraft/block/entity/ShulkerBoxBlockEntity.mapping +++ b/mappings/net/minecraft/block/entity/ShulkerBoxBlockEntity.mapping @@ -8,16 +8,14 @@ CLASS net/minecraft/class_2627 net/minecraft/block/entity/ShulkerBoxBlockEntity FIELD field_12060 cachedColor Lnet/minecraft/class_1767; METHOD (Lnet/minecraft/class_1767;Lnet/minecraft/class_2338;Lnet/minecraft/class_2680;)V ARG 1 color - METHOD method_11311 getBoundingBox (Lnet/minecraft/class_2350;F)Lnet/minecraft/class_238; METHOD method_11312 getAnimationProgress (F)F METHOD method_11313 getAnimationStage ()Lnet/minecraft/class_2627$class_2628; METHOD method_11314 getBoundingBox (Lnet/minecraft/class_2680;)Lnet/minecraft/class_238; ARG 1 state - METHOD method_11315 getCollisionBox (Lnet/minecraft/class_2350;F)Lnet/minecraft/class_238; - METHOD method_11316 pushEntities (Lnet/minecraft/class_1937;Lnet/minecraft/class_2338;Lnet/minecraft/class_2680;F)V + METHOD method_11316 pushEntities (Lnet/minecraft/class_1937;Lnet/minecraft/class_2338;Lnet/minecraft/class_2680;)V METHOD method_11317 serializeInventory (Lnet/minecraft/class_2487;)Lnet/minecraft/class_2487; ARG 1 tag - METHOD method_11318 updateAnimation (Lnet/minecraft/class_1937;Lnet/minecraft/class_2338;Lnet/minecraft/class_2680;Lnet/minecraft/class_2627;)V + METHOD method_11318 updateAnimation (Lnet/minecraft/class_1937;Lnet/minecraft/class_2338;Lnet/minecraft/class_2680;)V METHOD method_11319 deserializeInventory (Lnet/minecraft/class_2487;)V ARG 1 tag METHOD method_11320 getColor ()Lnet/minecraft/class_1767; diff --git a/mappings/net/minecraft/class_5797.mapping b/mappings/net/minecraft/class_5797.mapping new file mode 100644 index 0000000000..007db6c85f --- /dev/null +++ b/mappings/net/minecraft/class_5797.mapping @@ -0,0 +1,2 @@ +CLASS net/minecraft/class_5797 + METHOD method_10431 offerTo (Ljava/util/function/Consumer;)V diff --git a/mappings/net/minecraft/client/particle/SquidInkParticle.mapping b/mappings/net/minecraft/client/particle/SquidInkParticle.mapping index 987d0a7e4c..95edabeac8 100644 --- a/mappings/net/minecraft/client/particle/SquidInkParticle.mapping +++ b/mappings/net/minecraft/client/particle/SquidInkParticle.mapping @@ -1,5 +1,5 @@ CLASS net/minecraft/class_725 net/minecraft/client/particle/SquidInkParticle - METHOD (Lnet/minecraft/class_638;DDDDDDLnet/minecraft/class_4002;)V + METHOD (Lnet/minecraft/class_638;DDDDDDILnet/minecraft/class_4002;)V ARG 1 world ARG 2 x ARG 4 y @@ -7,7 +7,6 @@ CLASS net/minecraft/class_725 net/minecraft/client/particle/SquidInkParticle ARG 8 velocityX ARG 10 velocityY ARG 12 velocityZ - ARG 14 spriteProvider CLASS class_726 Factory FIELD field_17878 spriteProvider Lnet/minecraft/class_4002; METHOD (Lnet/minecraft/class_4002;)V diff --git a/mappings/net/minecraft/client/realms/gui/RealmsDataFetcher.mapping b/mappings/net/minecraft/client/realms/gui/RealmsDataFetcher.mapping index c697962e81..1bf2d57c91 100644 --- a/mappings/net/minecraft/client/realms/gui/RealmsDataFetcher.mapping +++ b/mappings/net/minecraft/client/realms/gui/RealmsDataFetcher.mapping @@ -2,11 +2,11 @@ CLASS net/minecraft/class_4360 net/minecraft/client/realms/gui/RealmsDataFetcher FIELD field_19639 LOGGER Lorg/apache/logging/log4j/Logger; FIELD field_19640 scheduler Ljava/util/concurrent/ScheduledExecutorService; FIELD field_19641 stopped Z - FIELD field_19642 serverListUpdateTask Ljava/lang/Runnable; - FIELD field_19643 pendingInviteUpdateTask Ljava/lang/Runnable; - FIELD field_19644 trialAvailabilityTask Ljava/lang/Runnable; - FIELD field_19645 liveStatsTask Ljava/lang/Runnable; - FIELD field_19646 unreadNewsTask Ljava/lang/Runnable; + FIELD field_19642 serverListUpdateTask Lnet/minecraft/class_5784; + FIELD field_19643 pendingInviteUpdateTask Lnet/minecraft/class_5784; + FIELD field_19644 trialAvailabilityTask Lnet/minecraft/class_5784; + FIELD field_19645 liveStatsTask Lnet/minecraft/class_5784; + FIELD field_19646 unreadNewsTask Lnet/minecraft/class_5784; FIELD field_19647 removedServers Ljava/util/Set; FIELD field_19648 servers Ljava/util/List; FIELD field_19649 livestats Lnet/minecraft/class_4882; @@ -41,12 +41,6 @@ CLASS net/minecraft/class_4360 net/minecraft/client/realms/gui/RealmsDataFetcher METHOD method_21099 scheduleTasks ()V METHOD method_21100 cancelTasks ()V METHOD method_21101 isActive ()Z - CLASS class_4361 LiveStatsTask - METHOD method_21102 getLiveStats ()V - CLASS class_4362 PendingInviteUpdateTask - METHOD method_21103 updatePendingInvites ()V - CLASS class_4363 ServerListUpdateTask - METHOD method_21104 updateServersList ()V CLASS class_4364 Task FIELD field_19664 SERVER_LIST Lnet/minecraft/class_4360$class_4364; FIELD field_19665 PENDING_INVITE Lnet/minecraft/class_4360$class_4364; @@ -55,7 +49,3 @@ CLASS net/minecraft/class_4360 net/minecraft/client/realms/gui/RealmsDataFetcher FIELD field_19668 UNREAD_NEWS Lnet/minecraft/class_4360$class_4364; METHOD valueOf (Ljava/lang/String;)Lnet/minecraft/class_4360$class_4364; ARG 0 name - CLASS class_4365 TrialAvailabilityTask - METHOD method_21105 getTrialAvailable ()V - CLASS class_4366 UnreadNewsTask - METHOD method_21106 getUnreadNews ()V diff --git a/mappings/net/minecraft/client/render/entity/EntityRenderDispatcher.mapping b/mappings/net/minecraft/client/render/entity/EntityRenderDispatcher.mapping index b8dec7a49f..00676bf8de 100644 --- a/mappings/net/minecraft/client/render/entity/EntityRenderDispatcher.mapping +++ b/mappings/net/minecraft/client/render/entity/EntityRenderDispatcher.mapping @@ -46,13 +46,6 @@ CLASS net/minecraft/class_898 net/minecraft/client/render/entity/EntityRenderDis ARG 8 z ARG 10 radius ARG 11 opacity - METHOD method_23164 drawBox (Lnet/minecraft/class_4587;Lnet/minecraft/class_4588;Lnet/minecraft/class_1297;FFF)V - ARG 1 matrix - ARG 2 vertices - ARG 3 entity - ARG 4 red - ARG 5 green - ARG 6 blue METHOD method_23165 renderFire (Lnet/minecraft/class_4587;Lnet/minecraft/class_4597;Lnet/minecraft/class_1297;)V ARG 1 matrices ARG 2 vertexConsumers @@ -102,10 +95,6 @@ CLASS net/minecraft/class_898 net/minecraft/client/render/entity/EntityRenderDis METHOD method_3955 setRenderHitboxes (Z)V ARG 1 value METHOD method_3956 renderHitbox (Lnet/minecraft/class_4587;Lnet/minecraft/class_4588;Lnet/minecraft/class_1297;F)V - ARG 1 matrices - ARG 2 vertices - ARG 3 entity - ARG 4 tickDelta METHOD method_3958 shouldRenderHitboxes ()Z METHOD method_3959 getSquaredDistanceToCamera (DDD)D ARG 1 x diff --git a/mappings/net/minecraft/client/resource/metadata/AnimationFrameResourceMetadata.mapping b/mappings/net/minecraft/client/resource/metadata/AnimationFrameResourceMetadata.mapping index e272f829b1..bf16199705 100644 --- a/mappings/net/minecraft/client/resource/metadata/AnimationFrameResourceMetadata.mapping +++ b/mappings/net/minecraft/client/resource/metadata/AnimationFrameResourceMetadata.mapping @@ -6,6 +6,5 @@ CLASS net/minecraft/class_1080 net/minecraft/client/resource/metadata/AnimationF METHOD (II)V ARG 1 index ARG 2 time - METHOD method_4689 usesDefaultFrameTime ()Z METHOD method_4690 getIndex ()I - METHOD method_4691 getTime ()I + METHOD method_4691 getTime (I)I diff --git a/mappings/net/minecraft/client/resource/metadata/AnimationResourceMetadata.mapping b/mappings/net/minecraft/client/resource/metadata/AnimationResourceMetadata.mapping index f8f1f1595c..b053e643a4 100644 --- a/mappings/net/minecraft/client/resource/metadata/AnimationResourceMetadata.mapping +++ b/mappings/net/minecraft/client/resource/metadata/AnimationResourceMetadata.mapping @@ -15,17 +15,9 @@ CLASS net/minecraft/class_1079 net/minecraft/client/resource/metadata/AnimationR METHOD method_24143 getSize (II)Lcom/mojang/datafixers/util/Pair; ARG 1 defaultWidth ARG 2 defaultHeight - METHOD method_4680 getFrameIndex (I)I - ARG 1 frameIndex - METHOD method_4681 getFrame (I)Lnet/minecraft/class_1080; - ARG 1 frameIndex - METHOD method_4682 getFrameCount ()I - METHOD method_4683 getFrameTime (I)I - ARG 1 frameIndex METHOD method_4684 getDefaultFrameTime ()I METHOD method_4685 shouldInterpolate ()Z METHOD method_4686 getHeight (I)I ARG 1 defaultHeight METHOD method_4687 getWidth (I)I ARG 1 defaultWidth - METHOD method_4688 getFrameIndexSet ()Ljava/util/Set; diff --git a/mappings/net/minecraft/client/texture/Sprite.mapping b/mappings/net/minecraft/client/texture/Sprite.mapping index 711c15b2c9..542ef463cd 100644 --- a/mappings/net/minecraft/client/texture/Sprite.mapping +++ b/mappings/net/minecraft/client/texture/Sprite.mapping @@ -1,21 +1,12 @@ CLASS net/minecraft/class_1058 net/minecraft/client/texture/Sprite FIELD field_21750 atlas Lnet/minecraft/class_1059; - FIELD field_21751 info Lnet/minecraft/class_1058$class_4727; - FIELD field_21752 interpolation Lnet/minecraft/class_1058$class_4728; FIELD field_5256 y I FIELD field_5258 x I FIELD field_5262 images [Lnet/minecraft/class_1011; - FIELD field_5264 frameYs [I - FIELD field_5265 frameXs [I FIELD field_5267 vMax F FIELD field_5268 vMin F FIELD field_5269 uMax F FIELD field_5270 uMin F - FIELD field_5271 animationMetadata Lnet/minecraft/class_1079; - FIELD field_5272 frameTicks I - COMMENT The tick position within the current frame. - COMMENT Resets to 0 on every frame advance. - FIELD field_5273 frameIndex I METHOD (Lnet/minecraft/class_1059;Lnet/minecraft/class_1058$class_4727;IIIIILnet/minecraft/class_1011;)V ARG 3 maxLevel ARG 4 atlasWidth @@ -28,8 +19,6 @@ CLASS net/minecraft/class_1058 net/minecraft/client/texture/Sprite METHOD method_24119 getAtlas ()Lnet/minecraft/class_1059; METHOD method_4570 getFrameV (D)F ARG 1 frame - METHOD method_4573 upload (I)V - ARG 1 frame METHOD method_4575 getMaxV ()F METHOD method_4577 getMaxU ()F METHOD method_4578 getWidth ()I @@ -48,9 +37,7 @@ CLASS net/minecraft/class_1058 net/minecraft/client/texture/Sprite METHOD method_4593 getMinV ()F METHOD method_4594 getMinU ()F METHOD method_4595 getHeight ()I - METHOD method_4597 tickAnimation ()V METHOD method_4598 getId ()Lnet/minecraft/class_2960; - METHOD method_4599 isAnimated ()Z CLASS class_4727 Info FIELD field_21753 id Lnet/minecraft/class_2960; FIELD field_21754 width I @@ -68,7 +55,7 @@ CLASS net/minecraft/class_1058 net/minecraft/client/texture/Sprite FIELD field_21758 images [Lnet/minecraft/class_1011; METHOD (Lnet/minecraft/class_1058;Lnet/minecraft/class_1058$class_4727;I)V ARG 3 mipmap - METHOD method_24128 apply ()V + METHOD method_24128 apply (Lnet/minecraft/class_1058$class_5790;)V COMMENT Linearly interpolate between the current and next frame on all mip levels COMMENT based on the tick position within the current frame, COMMENT and upload the results to the currently bound texture to the frame slot at position (0,0). @@ -78,9 +65,5 @@ CLASS net/minecraft/class_1058 net/minecraft/client/texture/Sprite ARG 1 delta ARG 3 to ARG 4 from - METHOD method_24130 getPixelColor (IIII)I + METHOD method_24130 getPixelColor (Lnet/minecraft/class_1058$class_5790;IIII)I COMMENT Returns the pixel color at frame {@code frameIndex} within mipmap {@code layer} at sprite relative coordinates. - ARG 1 frameIndex - ARG 2 layer - ARG 3 x - ARG 4 y diff --git a/mappings/net/minecraft/client/world/ClientChunkManager.mapping b/mappings/net/minecraft/client/world/ClientChunkManager.mapping index 27735b30f0..17876e77d0 100644 --- a/mappings/net/minecraft/client/world/ClientChunkManager.mapping +++ b/mappings/net/minecraft/client/world/ClientChunkManager.mapping @@ -7,13 +7,12 @@ CLASS net/minecraft/class_631 net/minecraft/client/world/ClientChunkManager METHOD (Lnet/minecraft/class_638;I)V ARG 1 world ARG 2 loadDistance - METHOD method_16020 loadChunkFromPacket (IILnet/minecraft/class_4548;Lnet/minecraft/class_2540;Lnet/minecraft/class_2487;I)Lnet/minecraft/class_2818; + METHOD method_16020 loadChunkFromPacket (IILnet/minecraft/class_4548;Lnet/minecraft/class_2540;Lnet/minecraft/class_2487;Ljava/util/BitSet;)Lnet/minecraft/class_2818; ARG 1 x ARG 2 z ARG 3 biomes ARG 4 buf ARG 5 tag - ARG 6 verticalStripBitmask METHOD method_20180 updateLoadDistance (I)V ARG 1 loadDistance METHOD method_20181 positionEquals (Lnet/minecraft/class_2818;II)Z diff --git a/mappings/net/minecraft/data/client/model/BlockStateModelGenerator.mapping b/mappings/net/minecraft/data/client/model/BlockStateModelGenerator.mapping index bfbdb2f365..2e946b7ff9 100644 --- a/mappings/net/minecraft/data/client/model/BlockStateModelGenerator.mapping +++ b/mappings/net/minecraft/data/client/model/BlockStateModelGenerator.mapping @@ -3,7 +3,6 @@ CLASS net/minecraft/class_4910 net/minecraft/data/client/model/BlockStateModelGe FIELD field_22831 modelCollector Ljava/util/function/BiConsumer; FIELD field_22832 simpleItemModelExemptionCollector Ljava/util/function/Consumer; METHOD (Ljava/util/function/Consumer;Ljava/util/function/BiConsumer;Ljava/util/function/Consumer;)V - ARG 1 blockStateCollector ARG 2 modelCollector ARG 3 simpleItemModelExemptionCollector METHOD method_25508 registerChorusPlant ()V @@ -93,9 +92,6 @@ CLASS net/minecraft/class_4910 net/minecraft/data/client/model/BlockStateModelGe ARG 1 block ARG 2 verticalModelFactory ARG 3 horizontalModelFactory - METHOD method_25555 registerTexturePool (Lnet/minecraft/class_2248;Lnet/minecraft/class_4946;)Lnet/minecraft/class_4910$class_4912; - ARG 1 block - ARG 2 model METHOD method_25556 registerItemModel (Lnet/minecraft/class_2248;Ljava/lang/String;)V ARG 1 block ARG 2 textureSuffix @@ -129,8 +125,6 @@ CLASS net/minecraft/class_4910 net/minecraft/data/client/model/BlockStateModelGe ARG 1 targetHalf ARG 2 regularModel ARG 3 hingeModel - METHOD method_25574 registerTexturePool (Lnet/minecraft/class_4944;)Lnet/minecraft/class_4910$class_4912; - ARG 1 texture METHOD method_25576 registerRandomHorizontalRotations (Lnet/minecraft/class_4946$class_4947;[Lnet/minecraft/class_2248;)V ARG 1 modelFactory ARG 2 blocks @@ -151,7 +145,6 @@ CLASS net/minecraft/class_4910 net/minecraft/data/client/model/BlockStateModelGe METHOD method_25593 registerTripwire ()V METHOD method_25594 registerTripwireHook ()V METHOD method_25595 registerTurtleEgg ()V - METHOD method_25596 registerVine ()V METHOD method_25597 registerMagmaBlock ()V METHOD method_25598 registerInfestedStone ()V METHOD method_25599 createNorthDefaultHorizontalRotationStates ()Lnet/minecraft/class_4926; @@ -210,9 +203,6 @@ CLASS net/minecraft/class_4910 net/minecraft/data/client/model/BlockStateModelGe METHOD method_25632 registerBuiltin (Lnet/minecraft/class_2248;Lnet/minecraft/class_2248;)Lnet/minecraft/class_4910$class_4911; ARG 1 block ARG 2 particleBlock - METHOD method_25633 registerTexturePool (Lnet/minecraft/class_2248;Lnet/minecraft/class_4946$class_4947;)Lnet/minecraft/class_4910$class_4912; - ARG 1 block - ARG 2 modelFactory METHOD method_25634 createBlockStateWithRandomHorizontalRotations (Lnet/minecraft/class_2248;Lnet/minecraft/class_2960;)Lnet/minecraft/class_4925; ARG 0 block ARG 1 modelId @@ -388,18 +378,13 @@ CLASS net/minecraft/class_4910 net/minecraft/data/client/model/BlockStateModelGe CLASS class_4912 BlockTexturePool FIELD field_22837 texture Lnet/minecraft/class_4944; FIELD field_22838 baseModelId Lnet/minecraft/class_2960; - METHOD (Lnet/minecraft/class_4910;Lnet/minecraft/class_4944;)V - ARG 2 texture METHOD method_25716 button (Lnet/minecraft/class_2248;)Lnet/minecraft/class_4910$class_4912; ARG 1 buttonBlock - METHOD method_25717 sign (Lnet/minecraft/class_2248;Lnet/minecraft/class_2248;)Lnet/minecraft/class_4910$class_4912; + METHOD method_25717 sign (Lnet/minecraft/class_2248;)Lnet/minecraft/class_4910$class_4912; ARG 1 signBlock - ARG 2 wallSignBlock METHOD method_25718 base (Lnet/minecraft/class_2248;Lnet/minecraft/class_4942;)Lnet/minecraft/class_4910$class_4912; ARG 1 block ARG 2 model - METHOD method_25719 base (Ljava/util/function/Function;)Lnet/minecraft/class_4910$class_4912; - ARG 1 modelFactory METHOD method_25720 wall (Lnet/minecraft/class_2248;)Lnet/minecraft/class_4910$class_4912; ARG 1 wallBlock METHOD method_25721 fence (Lnet/minecraft/class_2248;)Lnet/minecraft/class_4910$class_4912; @@ -408,10 +393,8 @@ CLASS net/minecraft/class_4910 net/minecraft/data/client/model/BlockStateModelGe ARG 1 fenceGateBlock METHOD method_25723 pressurePlate (Lnet/minecraft/class_2248;)Lnet/minecraft/class_4910$class_4912; ARG 1 pressurePlateBlock - METHOD method_25724 slab (Lnet/minecraft/class_2248;[Lnet/minecraft/class_2248;)Lnet/minecraft/class_4910$class_4912; - ARG 1 slabBlock - METHOD method_25725 stairs (Lnet/minecraft/class_2248;[Lnet/minecraft/class_2248;)Lnet/minecraft/class_4910$class_4912; - ARG 1 stairsBlock + METHOD method_25724 slab (Lnet/minecraft/class_2248;)Lnet/minecraft/class_4910$class_4912; + METHOD method_25725 stairs (Lnet/minecraft/class_2248;)Lnet/minecraft/class_4910$class_4912; CLASS class_4913 TintType METHOD method_25726 getCrossModel ()Lnet/minecraft/class_4942; METHOD method_25727 getFlowerPotCrossModel ()Lnet/minecraft/class_4942; diff --git a/mappings/net/minecraft/data/server/RecipesProvider.mapping b/mappings/net/minecraft/data/server/RecipesProvider.mapping index bd84a6dfb4..c2b2e7d0a3 100644 --- a/mappings/net/minecraft/data/server/RecipesProvider.mapping +++ b/mappings/net/minecraft/data/server/RecipesProvider.mapping @@ -36,33 +36,6 @@ CLASS net/minecraft/class_2446 net/minecraft/data/server/RecipesProvider METHOD method_24478 offerBoatRecipe (Ljava/util/function/Consumer;Lnet/minecraft/class_1935;Lnet/minecraft/class_1935;)V ARG 1 outputItem ARG 2 inputItem - METHOD method_24479 offerButtonRecipe (Ljava/util/function/Consumer;Lnet/minecraft/class_1935;Lnet/minecraft/class_1935;)V - ARG 1 outputItem - ARG 2 inputItem - METHOD method_24480 offerDoorRecipe (Ljava/util/function/Consumer;Lnet/minecraft/class_1935;Lnet/minecraft/class_1935;)V - ARG 1 outputItem - ARG 2 inputItem - METHOD method_24481 offerFenceRecipe (Ljava/util/function/Consumer;Lnet/minecraft/class_1935;Lnet/minecraft/class_1935;)V - ARG 1 outputItem - ARG 2 inputItem - METHOD method_24482 offerFenceGateRecipe (Ljava/util/function/Consumer;Lnet/minecraft/class_1935;Lnet/minecraft/class_1935;)V - ARG 1 outputItem - ARG 2 inputItem - METHOD method_24483 offerWoodenPressurePlateRecipe (Ljava/util/function/Consumer;Lnet/minecraft/class_1935;Lnet/minecraft/class_1935;)V - ARG 1 outputItem - ARG 2 inputItem - METHOD method_24484 offerWoodenSlabRecipe (Ljava/util/function/Consumer;Lnet/minecraft/class_1935;Lnet/minecraft/class_1935;)V - ARG 1 outputItem - ARG 2 inputItem - METHOD method_24485 offerWoodenStairsRecipe (Ljava/util/function/Consumer;Lnet/minecraft/class_1935;Lnet/minecraft/class_1935;)V - ARG 1 outputItem - ARG 2 inputItem - METHOD method_24486 offerTrapdoorRecipe (Ljava/util/function/Consumer;Lnet/minecraft/class_1935;Lnet/minecraft/class_1935;)V - ARG 1 outputItem - ARG 2 inputItem - METHOD method_24883 offerSignRecipe (Ljava/util/function/Consumer;Lnet/minecraft/class_1935;Lnet/minecraft/class_1935;)V - ARG 1 outputItem - ARG 2 inputItem METHOD method_24884 offerWoolDyeingRecipe (Ljava/util/function/Consumer;Lnet/minecraft/class_1935;Lnet/minecraft/class_1935;)V ARG 1 outputItem ARG 2 inputItem @@ -100,17 +73,15 @@ CLASS net/minecraft/class_2446 net/minecraft/data/server/RecipesProvider METHOD method_32233 offerCandleDyeingRecipe (Ljava/util/function/Consumer;Lnet/minecraft/class_1935;Lnet/minecraft/class_1935;)V ARG 1 outputItem ARG 2 inputItem - METHOD method_32804 createSlabRecipe (Lnet/minecraft/class_1935;Lnet/minecraft/class_1856;)Lnet/minecraft/class_2447; + METHOD method_32804 createSlabRecipe (Lnet/minecraft/class_1935;Lnet/minecraft/class_1856;)Lnet/minecraft/class_5797; ARG 0 outputItem - METHOD method_32805 createChiseledBlockRecipe (Lnet/minecraft/class_1935;Lnet/minecraft/class_1935;)Lnet/minecraft/class_2447; + METHOD method_32805 createChiseledBlockRecipe (Lnet/minecraft/class_1935;Lnet/minecraft/class_1856;)Lnet/minecraft/class_2447; ARG 0 outputItem - ARG 1 inputItem - METHOD method_32806 createPressurePlateRecipe (Lnet/minecraft/class_1935;[Lnet/minecraft/class_1935;)Lnet/minecraft/class_2447; + METHOD method_32806 createPressurePlateRecipe (Lnet/minecraft/class_1935;Lnet/minecraft/class_1856;)Lnet/minecraft/class_5797; ARG 0 outputItem - ARG 1 inputItems METHOD method_32807 hasItem (Lnet/minecraft/class_1935;)Ljava/lang/String; ARG 0 item - METHOD method_32808 createStairsRecipe (Lnet/minecraft/class_1935;Lnet/minecraft/class_1856;)Lnet/minecraft/class_2447; + METHOD method_32808 createStairsRecipe (Lnet/minecraft/class_1935;Lnet/minecraft/class_1856;)Lnet/minecraft/class_5797; ARG 0 outputItem ARG 1 inputItem METHOD method_32809 offerWallRecipe (Ljava/util/function/Consumer;Lnet/minecraft/class_1935;Lnet/minecraft/class_1935;)V @@ -131,6 +102,3 @@ CLASS net/minecraft/class_2446 net/minecraft/data/server/RecipesProvider METHOD method_32814 offerSlabRecipe (Ljava/util/function/Consumer;Lnet/minecraft/class_1935;Lnet/minecraft/class_1935;)V ARG 1 outputItem ARG 2 inputItem - METHOD method_32815 offerStonecutterRecipe (Ljava/util/function/Consumer;Lnet/minecraft/class_1935;Lnet/minecraft/class_1935;)V - ARG 1 outputItem - ARG 2 inputItem diff --git a/mappings/net/minecraft/data/server/recipe/ShapedRecipeJsonFactory.mapping b/mappings/net/minecraft/data/server/recipe/ShapedRecipeJsonFactory.mapping index 44345c4989..154defcf2a 100644 --- a/mappings/net/minecraft/data/server/recipe/ShapedRecipeJsonFactory.mapping +++ b/mappings/net/minecraft/data/server/recipe/ShapedRecipeJsonFactory.mapping @@ -12,14 +12,9 @@ CLASS net/minecraft/class_2447 net/minecraft/data/server/recipe/ShapedRecipeJson METHOD method_10428 input (Ljava/lang/Character;Lnet/minecraft/class_1856;)Lnet/minecraft/class_2447; ARG 1 c ARG 2 ingredient - METHOD method_10429 criterion (Ljava/lang/String;Lnet/minecraft/class_184;)Lnet/minecraft/class_2447; - ARG 1 criterionName - ARG 2 conditions METHOD method_10430 offerTo (Ljava/util/function/Consumer;Lnet/minecraft/class_2960;)V ARG 1 exporter ARG 2 recipeId - METHOD method_10431 offerTo (Ljava/util/function/Consumer;)V - ARG 1 exporter METHOD method_10432 validate (Lnet/minecraft/class_2960;)V ARG 1 recipeId METHOD method_10433 input (Ljava/lang/Character;Lnet/minecraft/class_3494;)Lnet/minecraft/class_2447; @@ -28,8 +23,6 @@ CLASS net/minecraft/class_2447 net/minecraft/data/server/recipe/ShapedRecipeJson METHOD method_10434 input (Ljava/lang/Character;Lnet/minecraft/class_1935;)Lnet/minecraft/class_2447; ARG 1 c ARG 2 itemProvider - METHOD method_10435 group (Ljava/lang/String;)Lnet/minecraft/class_2447; - ARG 1 group METHOD method_10436 create (Lnet/minecraft/class_1935;I)Lnet/minecraft/class_2447; ARG 0 output ARG 1 outputCount diff --git a/mappings/net/minecraft/data/server/recipe/ShapelessRecipeJsonFactory.mapping b/mappings/net/minecraft/data/server/recipe/ShapelessRecipeJsonFactory.mapping index d57e766fec..bf2d122500 100644 --- a/mappings/net/minecraft/data/server/recipe/ShapelessRecipeJsonFactory.mapping +++ b/mappings/net/minecraft/data/server/recipe/ShapelessRecipeJsonFactory.mapping @@ -8,14 +8,9 @@ CLASS net/minecraft/class_2450 net/minecraft/data/server/recipe/ShapelessRecipeJ METHOD (Lnet/minecraft/class_1935;I)V ARG 1 itemProvider ARG 2 outputCount - METHOD method_10442 criterion (Ljava/lang/String;Lnet/minecraft/class_184;)Lnet/minecraft/class_2450; - ARG 1 criterionName - ARG 2 conditions METHOD method_10443 offerTo (Ljava/util/function/Consumer;Lnet/minecraft/class_2960;)V ARG 1 exporter ARG 2 recipeId - METHOD method_10444 offerTo (Ljava/util/function/Consumer;)V - ARG 1 exporter METHOD method_10445 validate (Lnet/minecraft/class_2960;)V ARG 1 recipeId METHOD method_10446 input (Lnet/minecraft/class_3494;)Lnet/minecraft/class_2450; @@ -33,8 +28,6 @@ CLASS net/minecraft/class_2450 net/minecraft/data/server/recipe/ShapelessRecipeJ ARG 2 recipeIdStr METHOD method_10451 input (Lnet/minecraft/class_1856;)Lnet/minecraft/class_2450; ARG 1 ingredient - METHOD method_10452 group (Ljava/lang/String;)Lnet/minecraft/class_2450; - ARG 1 group METHOD method_10453 input (Lnet/minecraft/class_1856;I)Lnet/minecraft/class_2450; ARG 1 ingredient ARG 2 size diff --git a/mappings/net/minecraft/entity/Dismounting.mapping b/mappings/net/minecraft/entity/Dismounting.mapping index 0f522f9ab9..74c0541e5a 100644 --- a/mappings/net/minecraft/entity/Dismounting.mapping +++ b/mappings/net/minecraft/entity/Dismounting.mapping @@ -10,13 +10,6 @@ CLASS net/minecraft/class_5275 net/minecraft/entity/Dismounting METHOD method_30341 getCollisionShape (Lnet/minecraft/class_1922;Lnet/minecraft/class_2338;)Lnet/minecraft/class_265; ARG 0 world ARG 1 pos - METHOD method_30342 findDismountPos (Lnet/minecraft/class_1941;DDDLnet/minecraft/class_1309;Lnet/minecraft/class_4050;)Lnet/minecraft/class_243; - ARG 0 world - ARG 1 x - ARG 3 height - ARG 5 z - ARG 7 entity - ARG 8 pose METHOD method_30343 getCeilingHeight (Lnet/minecraft/class_2338;ILjava/util/function/Function;)D ARG 0 pos ARG 1 maxDistance diff --git a/mappings/net/minecraft/entity/Entity.mapping b/mappings/net/minecraft/entity/Entity.mapping index bccd399d33..9fbed874ef 100644 --- a/mappings/net/minecraft/entity/Entity.mapping +++ b/mappings/net/minecraft/entity/Entity.mapping @@ -175,10 +175,7 @@ CLASS net/minecraft/class_1297 net/minecraft/entity/Entity METHOD method_21751 isSneaky ()Z METHOD method_21752 isDescending ()Z METHOD method_22861 getTeamColorValue ()I - METHOD method_22862 resetPosition (DDD)V - ARG 1 x - ARG 3 y - ARG 5 z + METHOD method_22862 resetPosition ()V METHOD method_23311 refreshPosition ()V METHOD method_23312 getLandingPos ()Lnet/minecraft/class_2338; METHOD method_23313 getJumpVelocityMultiplier ()F @@ -509,7 +506,7 @@ CLASS net/minecraft/class_1297 net/minecraft/entity/Entity ARG 3 tickDelta ARG 4 includeFluids METHOD method_5746 onSwimmingStart ()V - METHOD method_5747 handleFallDamage (FF)Z + METHOD method_5747 handleFallDamage (FFLnet/minecraft/class_1282;)Z ARG 1 fallDistance ARG 2 damageMultiplier METHOD method_5748 getMaxAir ()I @@ -584,7 +581,6 @@ CLASS net/minecraft/class_1297 net/minecraft/entity/Entity METHOD method_5788 canBeRiddenInWater ()Z METHOD method_5790 updateSwimming ()V METHOD method_5791 getHeadYaw ()F - METHOD method_5792 moveToBoundingBoxCenter ()V METHOD method_5793 removePassenger (Lnet/minecraft/class_1297;)V ARG 1 passenger METHOD method_5794 isConnectedThroughVehicle (Lnet/minecraft/class_1297;)Z diff --git a/mappings/net/minecraft/entity/ai/TargetPredicate.mapping b/mappings/net/minecraft/entity/ai/TargetPredicate.mapping index b7114c53fe..cb84a2fe16 100644 --- a/mappings/net/minecraft/entity/ai/TargetPredicate.mapping +++ b/mappings/net/minecraft/entity/ai/TargetPredicate.mapping @@ -6,7 +6,6 @@ CLASS net/minecraft/class_4051 net/minecraft/entity/ai/TargetPredicate FIELD field_18096 includeHidden Z FIELD field_18097 ignoreEntityTargetRules Z FIELD field_18098 useDistanceScalingFactor Z - FIELD field_18099 predicate Ljava/util/function/Predicate; METHOD method_18417 includeInvulnerable ()Lnet/minecraft/class_4051; METHOD method_18418 setBaseMaxDistance (D)Lnet/minecraft/class_4051; ARG 1 baseMaxDistance diff --git a/mappings/net/minecraft/entity/ai/goal/TemptGoal.mapping b/mappings/net/minecraft/entity/ai/goal/TemptGoal.mapping index d33772ea4b..827f05361d 100644 --- a/mappings/net/minecraft/entity/ai/goal/TemptGoal.mapping +++ b/mappings/net/minecraft/entity/ai/goal/TemptGoal.mapping @@ -13,16 +13,7 @@ CLASS net/minecraft/class_1391 net/minecraft/entity/ai/goal/TemptGoal FIELD field_6621 lastPlayerZ D FIELD field_6622 food Lnet/minecraft/class_1856; METHOD (Lnet/minecraft/class_1314;DLnet/minecraft/class_1856;Z)V - ARG 1 mob ARG 2 speed - ARG 4 food - ARG 5 canBeScared - METHOD (Lnet/minecraft/class_1314;DZLnet/minecraft/class_1856;)V - ARG 1 mob - ARG 2 speed - ARG 4 canBeScared - ARG 5 food METHOD method_16081 canBeScared ()Z - METHOD method_6312 isTemptedBy (Lnet/minecraft/class_1799;)Z - ARG 1 stack + METHOD method_6312 isTemptedBy (Lnet/minecraft/class_1309;)Z METHOD method_6313 isActive ()Z diff --git a/mappings/net/minecraft/entity/decoration/ItemFrameEntity.mapping b/mappings/net/minecraft/entity/decoration/ItemFrameEntity.mapping index edbea4d67a..b80743cd27 100644 --- a/mappings/net/minecraft/entity/decoration/ItemFrameEntity.mapping +++ b/mappings/net/minecraft/entity/decoration/ItemFrameEntity.mapping @@ -4,10 +4,6 @@ CLASS net/minecraft/class_1533 net/minecraft/entity/decoration/ItemFrameEntity FIELD field_7130 ITEM_STACK Lnet/minecraft/class_2940; FIELD field_7131 ITEM_FRAME_LOGGER Lorg/apache/logging/log4j/Logger; FIELD field_7132 ROTATION Lnet/minecraft/class_2940; - METHOD (Lnet/minecraft/class_1937;Lnet/minecraft/class_2338;Lnet/minecraft/class_2350;)V - ARG 1 world - ARG 2 pos - ARG 3 direction METHOD method_6933 setHeldItemStack (Lnet/minecraft/class_1799;Z)V ARG 1 value ARG 2 update diff --git a/mappings/net/minecraft/entity/mob/ShulkerEntity.mapping b/mappings/net/minecraft/entity/mob/ShulkerEntity.mapping index b5f965df34..6ac85ae7e0 100644 --- a/mappings/net/minecraft/entity/mob/ShulkerEntity.mapping +++ b/mappings/net/minecraft/entity/mob/ShulkerEntity.mapping @@ -1,6 +1,5 @@ CLASS net/minecraft/class_1606 net/minecraft/entity/mob/ShulkerEntity FIELD field_7337 openProgress F - FIELD field_7338 ATTACHED_BLOCK Lnet/minecraft/class_2940; FIELD field_7339 prevOpenProgress F FIELD field_7340 teleportLerpTimer I FIELD field_7341 COVERED_ARMOR_BONUS_ID Ljava/util/UUID; @@ -10,34 +9,24 @@ CLASS net/minecraft/class_1606 net/minecraft/entity/mob/ShulkerEntity FIELD field_7345 prevAttachedBlock Lnet/minecraft/class_2338; FIELD field_7346 PEEK_AMOUNT Lnet/minecraft/class_2940; METHOD method_24350 canStay (Lnet/minecraft/class_2338;Lnet/minecraft/class_2350;)Z - ARG 1 pos - ARG 2 attachSide METHOD method_24351 findAttachSide (Lnet/minecraft/class_2338;)Lnet/minecraft/class_2350; ARG 1 pos METHOD method_26921 createShulkerAttributes ()Lnet/minecraft/class_5132$class_5133; METHOD method_31546 setColor (Lnet/minecraft/class_1767;)V ARG 1 color METHOD method_31547 spawnNewShulker ()V - METHOD method_7113 getTeleportLerpTimer ()I METHOD method_7115 getPeekAmount ()I METHOD method_7116 getOpenProgress (F)F ARG 1 delta - METHOD method_7117 hasAttachedBlock ()Z METHOD method_7119 getAttachedFace ()Lnet/minecraft/class_2350; - METHOD method_7120 getPrevAttachedBlock ()Lnet/minecraft/class_2338; METHOD method_7121 getColor ()Lnet/minecraft/class_1767; METHOD method_7122 setPeekAmount (I)V ARG 1 peekAmount - METHOD method_7123 getAttachedBlock ()Lnet/minecraft/class_2338; METHOD method_7124 isClosed ()Z - METHOD method_7125 setAttachedBlock (Lnet/minecraft/class_2338;)V - ARG 1 pos METHOD method_7127 tryTeleport ()Z CLASS class_1607 ShootBulletGoal FIELD field_7347 counter I CLASS class_1608 ShulkerBodyControl - METHOD (Lnet/minecraft/class_1606;Lnet/minecraft/class_1308;)V - ARG 2 entity CLASS class_1609 SearchForTargetGoal METHOD (Lnet/minecraft/class_1606;)V ARG 1 shulker diff --git a/mappings/net/minecraft/entity/mob/ShulkerLidCollisions.mapping b/mappings/net/minecraft/entity/mob/ShulkerLidCollisions.mapping deleted file mode 100644 index 037377a6c0..0000000000 --- a/mappings/net/minecraft/entity/mob/ShulkerLidCollisions.mapping +++ /dev/null @@ -1,4 +0,0 @@ -CLASS net/minecraft/class_4759 net/minecraft/entity/mob/ShulkerLidCollisions - METHOD method_24344 getLidCollisionBox (Lnet/minecraft/class_2338;Lnet/minecraft/class_2350;)Lnet/minecraft/class_238; - ARG 0 pos - ARG 1 direction diff --git a/mappings/net/minecraft/entity/passive/TurtleEntity.mapping b/mappings/net/minecraft/entity/passive/TurtleEntity.mapping index 1e2e40b88b..046aa373da 100644 --- a/mappings/net/minecraft/entity/passive/TurtleEntity.mapping +++ b/mappings/net/minecraft/entity/passive/TurtleEntity.mapping @@ -74,19 +74,6 @@ CLASS net/minecraft/class_1481 net/minecraft/entity/passive/TurtleEntity ARG 1 turtle ARG 2 speed ARG 4 chance - CLASS class_1490 ApproachFoodHoldingPlayerGoal - FIELD field_18117 CLOSE_ENTITY_PREDICATE Lnet/minecraft/class_4051; - FIELD field_6935 speed D - FIELD field_6936 cooldown I - FIELD field_6937 attractiveItems Ljava/util/Set; - FIELD field_6938 turtle Lnet/minecraft/class_1481; - FIELD field_6939 targetPlayer Lnet/minecraft/class_1657; - METHOD (Lnet/minecraft/class_1481;DLnet/minecraft/class_1792;)V - ARG 1 turtle - ARG 2 speed - ARG 4 attractiveItem - METHOD method_6701 isAttractive (Lnet/minecraft/class_1799;)Z - ARG 1 stack CLASS class_1491 TravelGoal FIELD field_6940 speed D FIELD field_6941 noPath Z diff --git a/mappings/net/minecraft/network/packet/s2c/play/ChunkDataS2CPacket.mapping b/mappings/net/minecraft/network/packet/s2c/play/ChunkDataS2CPacket.mapping index 3819682072..207735e968 100644 --- a/mappings/net/minecraft/network/packet/s2c/play/ChunkDataS2CPacket.mapping +++ b/mappings/net/minecraft/network/packet/s2c/play/ChunkDataS2CPacket.mapping @@ -1,5 +1,5 @@ CLASS net/minecraft/class_2672 net/minecraft/network/packet/s2c/play/ChunkDataS2CPacket - FIELD field_12234 verticalStripBitmask I + FIELD field_12234 verticalStripBitmask Ljava/util/BitSet; FIELD field_12235 chunkZ I FIELD field_12236 chunkX I FIELD field_12237 data [B @@ -14,9 +14,9 @@ CLASS net/minecraft/class_2672 net/minecraft/network/packet/s2c/play/ChunkDataS2 METHOD method_11523 getX ()I METHOD method_11524 getZ ()I METHOD method_11525 getBlockEntityTagList ()Ljava/util/List; - METHOD method_11526 getVerticalStripBitmask ()I + METHOD method_11526 getVerticalStripBitmask ()Ljava/util/BitSet; METHOD method_11527 getWriteBuffer ()Lio/netty/buffer/ByteBuf; - METHOD method_11529 writeData (Lnet/minecraft/class_2540;Lnet/minecraft/class_2818;)I + METHOD method_11529 writeData (Lnet/minecraft/class_2540;Lnet/minecraft/class_2818;)Ljava/util/BitSet; ARG 2 chunk METHOD method_16123 getHeightmaps ()Lnet/minecraft/class_2487; METHOD method_22422 getBiomeArray ()[I diff --git a/mappings/net/minecraft/particle/AbstractDustParticleEffect.mapping b/mappings/net/minecraft/particle/AbstractDustParticleEffect.mapping index f2c66211b2..e09078550e 100644 --- a/mappings/net/minecraft/particle/AbstractDustParticleEffect.mapping +++ b/mappings/net/minecraft/particle/AbstractDustParticleEffect.mapping @@ -1,9 +1,8 @@ CLASS net/minecraft/class_5744 net/minecraft/particle/AbstractDustParticleEffect - FIELD field_28273 color Lnet/minecraft/class_243; + FIELD field_28273 color Lnet/minecraft/class_1160; FIELD field_28274 scale F - METHOD (Lnet/minecraft/class_243;F)V - ARG 1 color + METHOD (Lnet/minecraft/class_1160;F)V ARG 2 scale - METHOD method_33118 readColor (Lcom/mojang/brigadier/StringReader;)Lnet/minecraft/class_243; - METHOD method_33119 getColor ()Lnet/minecraft/class_243; + METHOD method_33118 readColor (Lcom/mojang/brigadier/StringReader;)Lnet/minecraft/class_1160; + METHOD method_33119 getColor ()Lnet/minecraft/class_1160; METHOD method_33120 getScale ()F diff --git a/mappings/net/minecraft/particle/DustColorTransitionParticleEffect.mapping b/mappings/net/minecraft/particle/DustColorTransitionParticleEffect.mapping index 3430556d86..a04ae5d4de 100644 --- a/mappings/net/minecraft/particle/DustColorTransitionParticleEffect.mapping +++ b/mappings/net/minecraft/particle/DustColorTransitionParticleEffect.mapping @@ -1,12 +1,10 @@ CLASS net/minecraft/class_5743 net/minecraft/particle/DustColorTransitionParticleEffect - FIELD field_28267 SCULK_BLUE Lnet/minecraft/class_243; + FIELD field_28267 SCULK_BLUE Lnet/minecraft/class_1160; FIELD field_28268 DEFAULT Lnet/minecraft/class_5743; FIELD field_28269 CODEC Lcom/mojang/serialization/Codec; FIELD field_28270 FACTORY Lnet/minecraft/class_2394$class_2395; - FIELD field_28271 toColor Lnet/minecraft/class_243; - METHOD (Lnet/minecraft/class_243;Lnet/minecraft/class_243;F)V - ARG 1 fromColor - ARG 2 toColor + FIELD field_28271 toColor Lnet/minecraft/class_1160; + METHOD (Lnet/minecraft/class_1160;Lnet/minecraft/class_1160;F)V ARG 3 scale - METHOD method_33110 getFromColor ()Lnet/minecraft/class_243; - METHOD method_33112 getToColor ()Lnet/minecraft/class_243; + METHOD method_33110 getFromColor ()Lnet/minecraft/class_1160; + METHOD method_33112 getToColor ()Lnet/minecraft/class_1160; diff --git a/mappings/net/minecraft/particle/DustParticleEffect.mapping b/mappings/net/minecraft/particle/DustParticleEffect.mapping index bbf0179842..068f647bd3 100644 --- a/mappings/net/minecraft/particle/DustParticleEffect.mapping +++ b/mappings/net/minecraft/particle/DustParticleEffect.mapping @@ -2,4 +2,4 @@ CLASS net/minecraft/class_2390 net/minecraft/particle/DustParticleEffect FIELD field_11188 DEFAULT Lnet/minecraft/class_2390; FIELD field_11189 PARAMETERS_FACTORY Lnet/minecraft/class_2394$class_2395; FIELD field_25124 CODEC Lcom/mojang/serialization/Codec; - FIELD field_28272 RED Lnet/minecraft/class_243; + FIELD field_28272 RED Lnet/minecraft/class_1160; diff --git a/mappings/net/minecraft/server/MinecraftServer.mapping b/mappings/net/minecraft/server/MinecraftServer.mapping index d3828590a4..e5e0280b79 100644 --- a/mappings/net/minecraft/server/MinecraftServer.mapping +++ b/mappings/net/minecraft/server/MinecraftServer.mapping @@ -138,11 +138,11 @@ CLASS net/minecraft/server/MinecraftServer COMMENT To store the player data in addition to server data, call {@link PlayerManager#saveAllPlayerData()}. COMMENT COMMENT @return whether saving was successful + COMMENT if it should immediately write all data to storage device + COMMENT when set to true, all the {@link ServerWorld}s will be saved even if {@link ServerWorld#savingDisabled} is set to true ARG 1 suppressLogs ARG 2 flush - COMMENT if it should immediately write all data to storage device ARG 3 force - COMMENT when set to true, all the {@link ServerWorld}s will be saved even if {@link ServerWorld#savingDisabled} is set to true METHOD method_3724 isSinglePlayer ()Z METHOD method_3725 getIconFile ()Ljava/io/File; METHOD method_3727 hasGui ()Z diff --git a/mappings/net/minecraft/util/JsonSerializing.mapping b/mappings/net/minecraft/util/JsonSerializing.mapping index bfcc2c673c..8d3b95fbcd 100644 --- a/mappings/net/minecraft/util/JsonSerializing.mapping +++ b/mappings/net/minecraft/util/JsonSerializing.mapping @@ -36,7 +36,7 @@ CLASS net/minecraft/class_5330 net/minecraft/util/JsonSerializing FIELD field_25199 idFieldName Ljava/lang/String; FIELD field_25200 typeIdentification Ljava/util/function/Function; FIELD field_25201 elementSerializer Lcom/mojang/datafixers/util/Pair; - METHOD (Lnet/minecraft/class_2378;Ljava/lang/String;Ljava/lang/String;Ljava/util/function/Function;Lcom/mojang/datafixers/util/Pair;)V + METHOD (Lnet/minecraft/class_2378;Ljava/lang/String;Ljava/lang/String;Ljava/util/function/Function;Lnet/minecraft/class_5336;Lcom/mojang/datafixers/util/Pair;)V ARG 2 rootFieldName ARG 3 idFieldName ARG 4 typeIdentification diff --git a/mappings/net/minecraft/util/Util.mapping b/mappings/net/minecraft/util/Util.mapping index 6dced27ae2..986f94763c 100644 --- a/mappings/net/minecraft/util/Util.mapping +++ b/mappings/net/minecraft/util/Util.mapping @@ -90,9 +90,6 @@ CLASS net/minecraft/class_156 net/minecraft/util/Util METHOD method_32309 getRandom (Ljava/util/List;Ljava/util/Random;)Ljava/lang/Object; ARG 0 list ARG 1 random - METHOD method_33141 toDoubleArray (Ljava/util/stream/DoubleStream;D)Lcom/mojang/serialization/DataResult; - ARG 0 doubleStream - ARG 1 length METHOD method_645 previous (Ljava/lang/Iterable;Ljava/lang/Object;)Ljava/lang/Object; METHOD method_646 createTranslationKey (Ljava/lang/String;Lnet/minecraft/class_2960;)Ljava/lang/String; ARG 0 type diff --git a/mappings/net/minecraft/util/collection/WeightedPicker.mapping b/mappings/net/minecraft/util/collection/WeightedPicker.mapping index 04f762baec..cf3d8a1b0b 100644 --- a/mappings/net/minecraft/util/collection/WeightedPicker.mapping +++ b/mappings/net/minecraft/util/collection/WeightedPicker.mapping @@ -1,14 +1,14 @@ CLASS net/minecraft/class_3549 net/minecraft/util/collection/WeightedPicker - METHOD method_15444 getRandom (Ljava/util/Random;Ljava/util/List;I)Lnet/minecraft/class_3549$class_3550; + METHOD method_15444 getRandom (Ljava/util/Random;Ljava/util/List;I)Ljava/util/Optional; ARG 0 random ARG 1 list ARG 2 weightSum METHOD method_15445 getWeightSum (Ljava/util/List;)I ARG 0 list - METHOD method_15446 getRandom (Ljava/util/Random;Ljava/util/List;)Lnet/minecraft/class_3549$class_3550; + METHOD method_15446 getRandom (Ljava/util/Random;Ljava/util/List;)Ljava/util/Optional; ARG 0 random ARG 1 list - METHOD method_15447 getAt (Ljava/util/List;I)Lnet/minecraft/class_3549$class_3550; + METHOD method_15447 getAt (Ljava/util/List;I)Ljava/util/Optional; ARG 0 list ARG 1 weightMark CLASS class_3550 Entry diff --git a/mappings/net/minecraft/village/TradeOffers.mapping b/mappings/net/minecraft/village/TradeOffers.mapping index 66b87fb4fe..09426ee580 100644 --- a/mappings/net/minecraft/village/TradeOffers.mapping +++ b/mappings/net/minecraft/village/TradeOffers.mapping @@ -118,13 +118,11 @@ CLASS net/minecraft/class_3853 net/minecraft/village/TradeOffers ARG 3 count ARG 4 experience METHOD (Lnet/minecraft/class_1792;IIII)V - ARG 1 item ARG 2 price ARG 3 count ARG 4 maxUses ARG 5 experience METHOD (Lnet/minecraft/class_1799;IIII)V - ARG 1 stack ARG 2 price ARG 3 count ARG 4 maxUses diff --git a/mappings/net/minecraft/world/SpawnHelper.mapping b/mappings/net/minecraft/world/SpawnHelper.mapping index 411b727926..7c7e22f961 100644 --- a/mappings/net/minecraft/world/SpawnHelper.mapping +++ b/mappings/net/minecraft/world/SpawnHelper.mapping @@ -72,7 +72,7 @@ CLASS net/minecraft/class_1948 net/minecraft/world/SpawnHelper ARG 2 chunk ARG 3 checker ARG 4 runner - METHOD method_8664 pickRandomSpawnEntry (Lnet/minecraft/class_3218;Lnet/minecraft/class_5138;Lnet/minecraft/class_2794;Lnet/minecraft/class_1311;Ljava/util/Random;Lnet/minecraft/class_2338;)Lnet/minecraft/class_5483$class_1964; + METHOD method_8664 pickRandomSpawnEntry (Lnet/minecraft/class_3218;Lnet/minecraft/class_5138;Lnet/minecraft/class_2794;Lnet/minecraft/class_1311;Ljava/util/Random;Lnet/minecraft/class_2338;)Ljava/util/Optional; CLASS class_5259 Runner METHOD run (Lnet/minecraft/class_1308;Lnet/minecraft/class_2791;)V ARG 1 entity diff --git a/mappings/net/minecraft/world/chunk/WorldChunk.mapping b/mappings/net/minecraft/world/chunk/WorldChunk.mapping index c1f5283585..a06113298b 100644 --- a/mappings/net/minecraft/world/chunk/WorldChunk.mapping +++ b/mappings/net/minecraft/world/chunk/WorldChunk.mapping @@ -60,11 +60,10 @@ CLASS net/minecraft/class_2818 net/minecraft/world/chunk/WorldChunk METHOD method_12222 (Lnet/minecraft/class_3195;)Lit/unimi/dsi/fastutil/longs/LongSet; ARG 0 structure METHOD method_12223 isEmpty ()Z - METHOD method_12224 loadFromPacket (Lnet/minecraft/class_4548;Lnet/minecraft/class_2540;Lnet/minecraft/class_2487;I)V + METHOD method_12224 loadFromPacket (Lnet/minecraft/class_4548;Lnet/minecraft/class_2540;Lnet/minecraft/class_2487;Ljava/util/BitSet;)V ARG 1 biomes ARG 2 buf ARG 3 tag - ARG 4 verticalStripBitmask METHOD method_12225 getLevelType ()Lnet/minecraft/class_3193$class_3194; METHOD method_12226 setLoadedToWorld (Z)V ARG 1 loaded diff --git a/mappings/net/minecraft/world/gen/feature/LargeDripstoneFeature.mapping b/mappings/net/minecraft/world/gen/feature/LargeDripstoneFeature.mapping index 282a12886d..66778fb355 100644 --- a/mappings/net/minecraft/world/gen/feature/LargeDripstoneFeature.mapping +++ b/mappings/net/minecraft/world/gen/feature/LargeDripstoneFeature.mapping @@ -37,8 +37,6 @@ CLASS net/minecraft/class_5727 net/minecraft/world/gen/feature/LargeDripstoneFea FIELD field_28212 wind Lnet/minecraft/class_243; METHOD (ILjava/util/Random;Lnet/minecraft/class_5700;)V ARG 1 y - ARG 2 random - ARG 3 wind METHOD method_33031 modify (Lnet/minecraft/class_2338;)Lnet/minecraft/class_2338; ARG 1 pos METHOD method_33032 create ()Lnet/minecraft/class_5727$class_5729; diff --git a/mappings/net/minecraft/world/level/storage/LevelSummary.mapping b/mappings/net/minecraft/world/level/storage/LevelSummary.mapping index 59f180e523..1978728d2d 100644 --- a/mappings/net/minecraft/world/level/storage/LevelSummary.mapping +++ b/mappings/net/minecraft/world/level/storage/LevelSummary.mapping @@ -10,7 +10,6 @@ CLASS net/minecraft/class_34 net/minecraft/world/level/storage/LevelSummary METHOD method_248 getName ()Ljava/lang/String; METHOD method_249 getLastPlayed ()J METHOD method_252 getDisplayName ()Ljava/lang/String; - METHOD method_254 isOutdatedLevel ()Z METHOD method_255 requiresConversion ()Z METHOD method_256 isDifferentVersion ()Z METHOD method_257 isHardcore ()Z