diff --git a/build.gradle b/build.gradle index 320e81118b..c9488dbcf3 100644 --- a/build.gradle +++ b/build.gradle @@ -20,7 +20,7 @@ plugins { id 'net.fabricmc.filament' } -def minecraft_version = "24w12a" +def minecraft_version = "24w14potato" filament { minecraftVersion = minecraft_version diff --git a/mappings/net/minecraft/block/AbstractBlock.mapping b/mappings/net/minecraft/block/AbstractBlock.mapping index ac4dc0d1c1..85a1820e6c 100644 --- a/mappings/net/minecraft/block/AbstractBlock.mapping +++ b/mappings/net/minecraft/block/AbstractBlock.mapping @@ -267,8 +267,6 @@ CLASS net/minecraft/class_4970 net/minecraft/block/AbstractBlock COMMENT The set of {@link net.minecraft.resource.featuretoggle.FeatureFlag FeatureFlags} that are required for this block to work correctly. COMMENT COMMENT @see net.minecraft.resource.featuretoggle.FeatureFlags - METHOD (Lnet/minecraft/class_4970$class_2251;)V - ARG 1 settings METHOD method_17454 createScreenHandlerFactory (Lnet/minecraft/class_2680;Lnet/minecraft/class_1937;Lnet/minecraft/class_2338;)Lnet/minecraft/class_3908; COMMENT {@return the screen handler factory or {@code null} if screen handler cannot be created} COMMENT diff --git a/mappings/net/minecraft/block/ConnectingBlock.mapping b/mappings/net/minecraft/block/ConnectingBlock.mapping index bfa735b50d..6656ed0fde 100644 --- a/mappings/net/minecraft/block/ConnectingBlock.mapping +++ b/mappings/net/minecraft/block/ConnectingBlock.mapping @@ -13,7 +13,5 @@ CLASS net/minecraft/class_2429 net/minecraft/block/ConnectingBlock ARG 2 settings METHOD method_10368 getConnectionMask (Lnet/minecraft/class_2680;)I ARG 1 state - METHOD method_10369 (Ljava/util/EnumMap;)V - ARG 0 directions METHOD method_10370 generateFacingsToShapeMap (F)[Lnet/minecraft/class_265; ARG 1 radius diff --git a/mappings/net/minecraft/block/CropBlock.mapping b/mappings/net/minecraft/block/CropBlock.mapping index ad7555084c..92c67a2887 100644 --- a/mappings/net/minecraft/block/CropBlock.mapping +++ b/mappings/net/minecraft/block/CropBlock.mapping @@ -14,7 +14,7 @@ CLASS net/minecraft/class_2302 net/minecraft/block/CropBlock ARG 2 pos ARG 3 state METHOD method_9827 getMaxAge ()I - METHOD method_9828 withAge (I)Lnet/minecraft/class_2680; + METHOD method_9828 withAge (ILnet/minecraft/class_2680;)Lnet/minecraft/class_2680; ARG 1 age METHOD method_9829 getAge (Lnet/minecraft/class_2680;)I ARG 1 state diff --git a/mappings/net/minecraft/block/PointedDripstoneBlock.mapping b/mappings/net/minecraft/block/PointedDripstoneBlock.mapping index b91d1c78f5..e077f77f50 100644 --- a/mappings/net/minecraft/block/PointedDripstoneBlock.mapping +++ b/mappings/net/minecraft/block/PointedDripstoneBlock.mapping @@ -14,9 +14,7 @@ CLASS net/minecraft/class_5689 net/minecraft/block/PointedDripstoneBlock FIELD field_33569 STALACTITE_FLOOR_SEARCH_RANGE I FIELD field_36340 DRIP_COLLISION_SHAPE Lnet/minecraft/class_265; FIELD field_46413 CODEC Lcom/mojang/serialization/MapCodec; - METHOD method_32767 getDripPos (Lnet/minecraft/class_1937;Lnet/minecraft/class_2338;)Lnet/minecraft/class_2338; - ARG 0 world - ARG 1 pos + METHOD method_32767 getDripPos (Lnet/minecraft/class_2248;Lnet/minecraft/class_1937;Lnet/minecraft/class_2338;)Lnet/minecraft/class_2338; METHOD method_32768 createParticle (Lnet/minecraft/class_1937;Lnet/minecraft/class_2338;Lnet/minecraft/class_2680;Lnet/minecraft/class_3611;)V ARG 0 world ARG 1 pos @@ -27,59 +25,19 @@ CLASS net/minecraft/class_5689 net/minecraft/block/PointedDripstoneBlock ARG 1 pos ARG 2 fluid METHOD method_32770 getThickness (Lnet/minecraft/class_4538;Lnet/minecraft/class_2338;Lnet/minecraft/class_2350;Z)Lnet/minecraft/class_5691; - ARG 0 world - ARG 1 pos - ARG 2 direction - ARG 3 tryMerge METHOD method_32771 spawnFallingBlock (Lnet/minecraft/class_2680;Lnet/minecraft/class_3218;Lnet/minecraft/class_2338;)V - ARG 0 state - ARG 1 world - ARG 2 pos METHOD method_32772 dripTick (Lnet/minecraft/class_2680;Lnet/minecraft/class_3218;Lnet/minecraft/class_2338;F)V - ARG 0 state - ARG 1 world - ARG 2 pos - ARG 3 dripChance METHOD method_32774 isPointedDripstoneFacingDirection (Lnet/minecraft/class_2680;Lnet/minecraft/class_2350;)Z - ARG 0 state - ARG 1 direction METHOD method_32775 getDripFluid (Lnet/minecraft/class_3218;Lnet/minecraft/class_2338;)Lnet/minecraft/class_3611; - ARG 0 world - ARG 1 pos METHOD method_32776 getSupportingPos (Lnet/minecraft/class_1937;Lnet/minecraft/class_2338;Lnet/minecraft/class_2680;I)Ljava/util/Optional; - ARG 0 world - ARG 1 pos - ARG 2 state - ARG 3 range METHOD method_32777 getDirectionToPlaceAt (Lnet/minecraft/class_4538;Lnet/minecraft/class_2338;Lnet/minecraft/class_2350;)Lnet/minecraft/class_2350; - ARG 0 world - ARG 1 pos - ARG 2 direction METHOD method_32778 isHeldByPointedDripstone (Lnet/minecraft/class_2680;Lnet/minecraft/class_4538;Lnet/minecraft/class_2338;)Z - ARG 0 state - ARG 1 world - ARG 2 pos METHOD method_32781 canPlaceAtWithDirection (Lnet/minecraft/class_4538;Lnet/minecraft/class_2338;Lnet/minecraft/class_2350;)Z - ARG 0 world - ARG 1 pos - ARG 2 direction METHOD method_32782 getTipPos (Lnet/minecraft/class_2680;Lnet/minecraft/class_1936;Lnet/minecraft/class_2338;IZ)Lnet/minecraft/class_2338; - ARG 0 state - ARG 1 world - ARG 2 pos - ARG 3 range - ARG 4 allowMerged METHOD method_32783 canDrip (Lnet/minecraft/class_2680;)Z - ARG 0 state METHOD method_32784 isTip (Lnet/minecraft/class_2680;Z)Z - ARG 0 state - ARG 1 allowMerged METHOD method_32785 isPointingDown (Lnet/minecraft/class_2680;)Z - ARG 0 state METHOD method_32899 createParticle (Lnet/minecraft/class_1937;Lnet/minecraft/class_2338;Lnet/minecraft/class_2680;)V - ARG 0 world - ARG 1 pos - ARG 2 state METHOD method_33270 (FLnet/minecraft/class_5689$class_7381;)Z ARG 1 fluid METHOD method_33271 getDripFluid (Lnet/minecraft/class_1937;Lnet/minecraft/class_3611;)Lnet/minecraft/class_3611; @@ -97,59 +55,22 @@ CLASS net/minecraft/class_5689 net/minecraft/block/PointedDripstoneBlock ARG 0 fluid METHOD method_33274 (Lnet/minecraft/class_3611;Lnet/minecraft/class_2680;)Z ARG 1 state - METHOD method_33275 (Lnet/minecraft/class_2350;Lnet/minecraft/class_2338;Lnet/minecraft/class_2680;)Z - ARG 1 posx - ARG 2 statex METHOD method_33276 getFluid (Lnet/minecraft/class_1937;Lnet/minecraft/class_2338;Lnet/minecraft/class_2680;)Ljava/util/Optional; - ARG 0 world - ARG 1 pos - ARG 2 state METHOD method_33277 (Lnet/minecraft/class_1937;Lnet/minecraft/class_2338;Lnet/minecraft/class_2680;Lnet/minecraft/class_5689$class_7381;)V ARG 3 fluid - METHOD method_33278 (Lnet/minecraft/class_2350;Lnet/minecraft/class_2338;Lnet/minecraft/class_2680;)Z - ARG 1 posx - ARG 2 statex METHOD method_33279 (Lnet/minecraft/class_1937;Lnet/minecraft/class_2338;)Lnet/minecraft/class_5689$class_7381; ARG 1 posx METHOD method_33280 (Lnet/minecraft/class_1937;Lnet/minecraft/class_2338;Lnet/minecraft/class_2680;Lnet/minecraft/class_5689$class_7381;)V ARG 3 fluid - METHOD method_33281 (Lnet/minecraft/class_2680;)Z - ARG 0 statex METHOD method_35283 isPointingUp (Lnet/minecraft/class_2680;)Z - ARG 0 state METHOD method_36368 tryGrowStalagmite (Lnet/minecraft/class_3218;Lnet/minecraft/class_2338;)V - ARG 0 world - ARG 1 pos METHOD method_36369 tryGrow (Lnet/minecraft/class_3218;Lnet/minecraft/class_2338;Lnet/minecraft/class_2350;)V - ARG 0 world - ARG 1 pos - ARG 2 direction METHOD method_36370 place (Lnet/minecraft/class_1936;Lnet/minecraft/class_2338;Lnet/minecraft/class_2350;Lnet/minecraft/class_5691;)V - ARG 0 world - ARG 1 pos - ARG 2 direction - ARG 3 thickness METHOD method_36371 canGrow (Lnet/minecraft/class_2680;Lnet/minecraft/class_2680;)Z - ARG 0 dripstoneBlockState - ARG 1 waterState METHOD method_36372 isTip (Lnet/minecraft/class_2680;Lnet/minecraft/class_2350;)Z - ARG 0 state - ARG 1 direction - METHOD method_36373 (ZLnet/minecraft/class_2680;)Z - ARG 1 statex METHOD method_36374 canGrow (Lnet/minecraft/class_2680;Lnet/minecraft/class_3218;Lnet/minecraft/class_2338;)Z - ARG 0 state - ARG 1 world - ARG 2 pos METHOD method_36375 tryGrow (Lnet/minecraft/class_2680;Lnet/minecraft/class_3218;Lnet/minecraft/class_2338;Lnet/minecraft/class_5819;)V - ARG 0 state - ARG 1 world - ARG 2 pos - ARG 3 random METHOD method_36376 growMerged (Lnet/minecraft/class_2680;Lnet/minecraft/class_1936;Lnet/minecraft/class_2338;)V - ARG 0 state - ARG 1 world - ARG 2 pos METHOD method_40016 canDripThrough (Lnet/minecraft/class_1922;Lnet/minecraft/class_2338;Lnet/minecraft/class_2680;)Z COMMENT {@return whether it can drip through the block {@code block} at {@code pos}} COMMENT diff --git a/mappings/net/minecraft/block/SculkSensorBlock.mapping b/mappings/net/minecraft/block/SculkSensorBlock.mapping index 9b7f0d78ee..236d113fad 100644 --- a/mappings/net/minecraft/block/SculkSensorBlock.mapping +++ b/mappings/net/minecraft/block/SculkSensorBlock.mapping @@ -5,8 +5,6 @@ CLASS net/minecraft/class_5703 net/minecraft/block/SculkSensorBlock FIELD field_28114 OUTLINE_SHAPE Lnet/minecraft/class_265; FIELD field_43248 RESONATION_NOTE_PITCHES [F FIELD field_46435 CODEC Lcom/mojang/serialization/MapCodec; - METHOD (Lnet/minecraft/class_4970$class_2251;)V - ARG 1 settings METHOD method_32902 updateNeighbors (Lnet/minecraft/class_1937;Lnet/minecraft/class_2338;Lnet/minecraft/class_2680;)V ARG 0 world ARG 1 pos diff --git a/mappings/net/minecraft/block/dispenser/DispenserBehavior.mapping b/mappings/net/minecraft/block/dispenser/DispenserBehavior.mapping index b5f1061be0..959f2c17ff 100644 --- a/mappings/net/minecraft/block/dispenser/DispenserBehavior.mapping +++ b/mappings/net/minecraft/block/dispenser/DispenserBehavior.mapping @@ -15,7 +15,7 @@ CLASS net/minecraft/class_2357 net/minecraft/block/dispenser/DispenserBehavior CLASS 10 FIELD field_49137 fallbackBehavior Lnet/minecraft/class_2347; CLASS 17 - CLASS 18 + CLASS 19 FIELD field_49138 fallbackBehavior Lnet/minecraft/class_2347; METHOD method_57069 (Lnet/minecraft/class_4970$class_4971;)Z ARG 0 state @@ -26,22 +26,22 @@ CLASS net/minecraft/class_2357 net/minecraft/block/dispenser/DispenserBehavior CLASS 2 METHOD method_48306 (Lnet/minecraft/class_2350;Lnet/minecraft/class_1531;)V ARG 1 entity - CLASS 22 - FIELD field_38001 fallback Lnet/minecraft/class_2347; CLASS 24 + FIELD field_38001 fallback Lnet/minecraft/class_2347; + CLASS 25 METHOD method_17199 (Lnet/minecraft/class_1799;Lnet/minecraft/class_1681;)V ARG 1 entity - CLASS 25 + CLASS 26 METHOD method_17200 (Lnet/minecraft/class_1799;Lnet/minecraft/class_1680;)V ARG 1 entity - CLASS 26 + CLASS 27 METHOD method_17201 (Lnet/minecraft/class_1799;Lnet/minecraft/class_1683;)V ARG 1 entity - CLASS 27 + CLASS 28 CLASS 1 METHOD method_17203 (Lnet/minecraft/class_1799;Lnet/minecraft/class_1686;)V ARG 1 entity - CLASS 28 + CLASS 29 CLASS 1 METHOD method_17202 (Lnet/minecraft/class_1799;Lnet/minecraft/class_1686;)V ARG 1 entity diff --git a/mappings/net/minecraft/block/entity/AbstractFurnaceBlockEntity.mapping b/mappings/net/minecraft/block/entity/AbstractFurnaceBlockEntity.mapping index 845337bd1c..0cc335c6dd 100644 --- a/mappings/net/minecraft/block/entity/AbstractFurnaceBlockEntity.mapping +++ b/mappings/net/minecraft/block/entity/AbstractFurnaceBlockEntity.mapping @@ -44,9 +44,7 @@ CLASS net/minecraft/class_2609 net/minecraft/block/entity/AbstractFurnaceBlockEn ARG 0 fuelTimes ARG 1 item ARG 2 fuelTime - METHOD method_11203 craftRecipe (Lnet/minecraft/class_5455;Lnet/minecraft/class_8786;Lnet/minecraft/class_2371;I)Z - ARG 0 registryManager - ARG 1 recipe + METHOD method_11203 craftRecipe (Lnet/minecraft/class_1937;Lnet/minecraft/class_8786;Lnet/minecraft/class_2371;I)Z ARG 2 slots ARG 3 count METHOD method_17029 getCookTime (Lnet/minecraft/class_1937;Lnet/minecraft/class_2609;)I diff --git a/mappings/net/minecraft/class_9545.mapping b/mappings/net/minecraft/class_9545.mapping new file mode 100644 index 0000000000..ef1211e2c5 --- /dev/null +++ b/mappings/net/minecraft/class_9545.mapping @@ -0,0 +1,3 @@ +CLASS net/minecraft/class_9545 + CLASS class_9549 + FIELD comp_2029 player Ljava/util/Optional; diff --git a/mappings/net/minecraft/class_9583.mapping b/mappings/net/minecraft/class_9583.mapping new file mode 100644 index 0000000000..2aa9d0aed2 --- /dev/null +++ b/mappings/net/minecraft/class_9583.mapping @@ -0,0 +1,3 @@ +CLASS net/minecraft/class_9583 + CLASS class_9584 + FIELD comp_2029 player Ljava/util/Optional; diff --git a/mappings/net/minecraft/client/gl/VertexBuffer.mapping b/mappings/net/minecraft/client/gl/VertexBuffer.mapping index 4535d43c17..9a0f262791 100644 --- a/mappings/net/minecraft/client/gl/VertexBuffer.mapping +++ b/mappings/net/minecraft/client/gl/VertexBuffer.mapping @@ -42,7 +42,6 @@ CLASS net/minecraft/class_291 net/minecraft/client/gl/VertexBuffer METHOD method_34431 drawInternal (Lorg/joml/Matrix4f;Lorg/joml/Matrix4f;Lnet/minecraft/class_5944;)V ARG 1 viewMatrix ARG 2 projectionMatrix - ARG 3 program METHOD method_34435 getVertexFormat ()Lnet/minecraft/class_293; METHOD method_35665 draw ()V COMMENT Draws the contents in this vertex buffer. diff --git a/mappings/net/minecraft/client/gui/LogoDrawer.mapping b/mappings/net/minecraft/client/gui/LogoDrawer.mapping index e6886f1bd9..e1cfbf7cf3 100644 --- a/mappings/net/minecraft/client/gui/LogoDrawer.mapping +++ b/mappings/net/minecraft/client/gui/LogoDrawer.mapping @@ -1,19 +1,10 @@ CLASS net/minecraft/class_8020 net/minecraft/client/gui/LogoDrawer - FIELD field_41805 LOGO_TEXTURE Lnet/minecraft/class_2960; - FIELD field_41806 EDITION_TEXTURE Lnet/minecraft/class_2960; FIELD field_41807 LOGO_REGION_WIDTH I FIELD field_41808 LOGO_REGION_HEIGHT I FIELD field_41809 LOGO_BASE_Y I - FIELD field_41810 minceraft Z FIELD field_41811 ignoreAlpha Z - FIELD field_44540 MINCERAFT_TEXTURE Lnet/minecraft/class_2960; FIELD field_44541 LOGO_TEXTURE_WIDTH I FIELD field_44542 LOGO_TEXTURE_HEIGHT I - FIELD field_44543 EDITION_REGION_WIDTH I - FIELD field_44544 EDITION_REGION_HEIGHT I - FIELD field_44545 EDITION_TEXTURE_WIDTH I - FIELD field_44546 EDITION_TEXTURE_HEIGHT I - FIELD field_44547 LOGO_AND_EDITION_OVERLAP I METHOD (Z)V ARG 1 ignoreAlpha METHOD method_48209 draw (Lnet/minecraft/class_332;IF)V diff --git a/mappings/net/minecraft/client/gui/hud/ClientBossBar.mapping b/mappings/net/minecraft/client/gui/hud/ClientBossBar.mapping index a09ea8068a..6e1270e118 100644 --- a/mappings/net/minecraft/client/gui/hud/ClientBossBar.mapping +++ b/mappings/net/minecraft/client/gui/hud/ClientBossBar.mapping @@ -2,7 +2,7 @@ CLASS net/minecraft/class_345 net/minecraft/client/gui/hud/ClientBossBar FIELD field_2128 timeHealthSet J FIELD field_2129 healthLatest F FIELD field_32204 HEALTH_CHANGE_ANIMATION_MS J - METHOD (Ljava/util/UUID;Lnet/minecraft/class_2561;FLnet/minecraft/class_1259$class_1260;Lnet/minecraft/class_1259$class_1261;ZZZ)V + METHOD (Ljava/util/UUID;Lnet/minecraft/class_2561;FLnet/minecraft/class_1259$class_1260;Lnet/minecraft/class_1259$class_1261;ZZZLnet/minecraft/class_243;I)V ARG 1 uuid ARG 2 name ARG 3 percent diff --git a/mappings/net/minecraft/client/item/ModelPredicateProviderRegistry.mapping b/mappings/net/minecraft/client/item/ModelPredicateProviderRegistry.mapping index 3d06bbb161..801015a2b3 100644 --- a/mappings/net/minecraft/client/item/ModelPredicateProviderRegistry.mapping +++ b/mappings/net/minecraft/client/item/ModelPredicateProviderRegistry.mapping @@ -22,11 +22,6 @@ CLASS net/minecraft/class_5272 net/minecraft/client/item/ModelPredicateProviderR METHOD method_27881 register (Lnet/minecraft/class_2960;Lnet/minecraft/class_6395;)Lnet/minecraft/class_6395; ARG 0 id ARG 1 provider - METHOD method_27882 (Lnet/minecraft/class_1799;Lnet/minecraft/class_638;Lnet/minecraft/class_1309;I)F - ARG 0 stack - ARG 1 world - ARG 2 entity - ARG 3 seed METHOD method_27883 (Lnet/minecraft/class_1799;Lnet/minecraft/class_638;Lnet/minecraft/class_1309;I)F ARG 0 stack ARG 1 world @@ -112,11 +107,6 @@ CLASS net/minecraft/class_5272 net/minecraft/client/item/ModelPredicateProviderR ARG 0 world ARG 1 stack ARG 2 entity - METHOD method_43611 (Lnet/minecraft/class_1799;Lnet/minecraft/class_638;Lnet/minecraft/class_1309;I)F - ARG 0 stack - ARG 1 world - ARG 2 entity - ARG 3 seed METHOD method_48484 (Lnet/minecraft/class_1799;Lnet/minecraft/class_638;Lnet/minecraft/class_1309;I)F ARG 0 stack ARG 1 world diff --git a/mappings/net/minecraft/client/particle/PortalParticle.mapping b/mappings/net/minecraft/client/particle/PortalParticle.mapping index 1421be3a98..f783815c96 100644 --- a/mappings/net/minecraft/client/particle/PortalParticle.mapping +++ b/mappings/net/minecraft/client/particle/PortalParticle.mapping @@ -4,5 +4,5 @@ CLASS net/minecraft/class_709 net/minecraft/client/particle/PortalParticle FIELD field_3886 startX D CLASS class_710 Factory FIELD field_17865 spriteProvider Lnet/minecraft/class_4002; - METHOD (Lnet/minecraft/class_4002;)V + METHOD (Lnet/minecraft/class_4002;FFF)V ARG 1 spriteProvider diff --git a/mappings/net/minecraft/client/particle/ReversePortalParticle.mapping b/mappings/net/minecraft/client/particle/ReversePortalParticle.mapping index 44558ce0a7..ab29037751 100644 --- a/mappings/net/minecraft/client/particle/ReversePortalParticle.mapping +++ b/mappings/net/minecraft/client/particle/ReversePortalParticle.mapping @@ -1,5 +1,5 @@ CLASS net/minecraft/class_4974 net/minecraft/client/particle/ReversePortalParticle CLASS class_4975 Factory FIELD field_23188 spriteProvider Lnet/minecraft/class_4002; - METHOD (Lnet/minecraft/class_4002;)V + METHOD (Lnet/minecraft/class_4002;FFF)V ARG 1 spriteProvider diff --git a/mappings/net/minecraft/client/render/block/BlockRenderManager.mapping b/mappings/net/minecraft/client/render/block/BlockRenderManager.mapping index 9908f8ed8d..4f66c18093 100644 --- a/mappings/net/minecraft/client/render/block/BlockRenderManager.mapping +++ b/mappings/net/minecraft/client/render/block/BlockRenderManager.mapping @@ -19,7 +19,7 @@ CLASS net/minecraft/class_776 net/minecraft/client/render/block/BlockRenderManag ARG 1 state METHOD method_3350 getModelRenderer ()Lnet/minecraft/class_778; METHOD method_3351 getModels ()Lnet/minecraft/class_773; - METHOD method_3352 renderFluid (Lnet/minecraft/class_2338;Lnet/minecraft/class_1920;Lnet/minecraft/class_4588;Lnet/minecraft/class_2680;Lnet/minecraft/class_3610;)V + METHOD method_3352 renderFluid (Lnet/minecraft/class_2338;Lnet/minecraft/class_1920;Lnet/minecraft/class_4588;Lnet/minecraft/class_2680;Lnet/minecraft/class_3610;III)V ARG 1 pos ARG 2 world ARG 3 vertexConsumer diff --git a/mappings/net/minecraft/client/render/block/FluidRenderer.mapping b/mappings/net/minecraft/client/render/block/FluidRenderer.mapping index 464e848fcb..1b412759cf 100644 --- a/mappings/net/minecraft/client/render/block/FluidRenderer.mapping +++ b/mappings/net/minecraft/client/render/block/FluidRenderer.mapping @@ -41,7 +41,7 @@ CLASS net/minecraft/class_775 net/minecraft/client/render/block/FluidRenderer ARG 3 maxDeviation ARG 4 state METHOD method_3345 onResourceReload ()V - METHOD method_3347 render (Lnet/minecraft/class_1920;Lnet/minecraft/class_2338;Lnet/minecraft/class_4588;Lnet/minecraft/class_2680;Lnet/minecraft/class_3610;)V + METHOD method_3347 render (Lnet/minecraft/class_1920;Lnet/minecraft/class_2338;Lnet/minecraft/class_4588;Lnet/minecraft/class_2680;Lnet/minecraft/class_3610;DDD)V ARG 1 world ARG 2 pos ARG 3 vertexConsumer diff --git a/mappings/net/minecraft/client/render/entity/GuardianEntityRenderer.mapping b/mappings/net/minecraft/client/render/entity/GuardianEntityRenderer.mapping index e92420a31e..8f85da59a5 100644 --- a/mappings/net/minecraft/client/render/entity/GuardianEntityRenderer.mapping +++ b/mappings/net/minecraft/client/render/entity/GuardianEntityRenderer.mapping @@ -1,5 +1,4 @@ CLASS net/minecraft/class_907 net/minecraft/client/render/entity/GuardianEntityRenderer - FIELD field_21743 LAYER Lnet/minecraft/class_1921; FIELD field_4708 TEXTURE Lnet/minecraft/class_2960; FIELD field_4709 EXPLOSION_BEAM_TEXTURE Lnet/minecraft/class_2960; METHOD (Lnet/minecraft/class_5617$class_5618;FLnet/minecraft/class_5601;)V diff --git a/mappings/net/minecraft/client/render/entity/model/GuardianEntityModel.mapping b/mappings/net/minecraft/client/render/entity/model/GuardianEntityModel.mapping index 3a23207cad..7de271d49a 100644 --- a/mappings/net/minecraft/client/render/entity/model/GuardianEntityModel.mapping +++ b/mappings/net/minecraft/client/render/entity/model/GuardianEntityModel.mapping @@ -23,22 +23,10 @@ CLASS net/minecraft/class_570 net/minecraft/client/render/entity/model/GuardianE METHOD method_24185 updateSpikeExtensions (FF)V ARG 1 animationProgress ARG 2 extension - METHOD method_32002 getTexturedModelData ()Lnet/minecraft/class_5607; + METHOD method_32002 getTexturedModelData (Z)Lnet/minecraft/class_5607; METHOD method_32003 getSpikeName (I)Ljava/lang/String; ARG 0 index METHOD method_32004 getAngle (IFF)F ARG 0 index ARG 1 animationProgress ARG 2 magnitude - METHOD method_32005 getSpikePivotX (IFF)F - ARG 0 index - ARG 1 animationProgress - ARG 2 extension - METHOD method_32006 getSpikePivotY (IFF)F - ARG 0 index - ARG 1 animationProgress - ARG 2 extension - METHOD method_32007 getSpikePivotZ (IFF)F - ARG 0 index - ARG 1 animationProgress - ARG 2 extension diff --git a/mappings/net/minecraft/client/world/ClientWorld.mapping b/mappings/net/minecraft/client/world/ClientWorld.mapping index 0b296e59cb..6d96c660a6 100644 --- a/mappings/net/minecraft/client/world/ClientWorld.mapping +++ b/mappings/net/minecraft/client/world/ClientWorld.mapping @@ -54,7 +54,6 @@ CLASS net/minecraft/class_638 net/minecraft/client/world/ClientWorld ARG 1 cache METHOD method_23780 calculateColor (Lnet/minecraft/class_2338;Lnet/minecraft/class_6539;)I ARG 1 pos - ARG 2 colorResolver METHOD method_23782 resetChunkColor (Lnet/minecraft/class_1923;)V ARG 1 chunkPos METHOD method_23783 getSkyBrightness (F)F @@ -109,8 +108,6 @@ CLASS net/minecraft/class_638 net/minecraft/client/world/ClientWorld METHOD method_32121 (Lnet/minecraft/class_1923;Lnet/minecraft/class_6539;Lnet/minecraft/class_4700;)V ARG 1 resolver ARG 2 cache - METHOD method_32124 (Lnet/minecraft/class_1297;)V - ARG 1 entity METHOD method_32689 (Lnet/minecraft/class_4543;III)Lnet/minecraft/class_243; ARG 1 x ARG 2 y diff --git a/mappings/net/minecraft/component/type/FoodComponent.mapping b/mappings/net/minecraft/component/type/FoodComponent.mapping index 84d8167710..2c66dd9491 100644 --- a/mappings/net/minecraft/component/type/FoodComponent.mapping +++ b/mappings/net/minecraft/component/type/FoodComponent.mapping @@ -3,7 +3,7 @@ CLASS net/minecraft/class_4174 net/minecraft/component/type/FoodComponent FIELD field_49992 CODEC Lcom/mojang/serialization/Codec; FIELD field_49993 PACKET_CODEC Lnet/minecraft/class_9139; FIELD field_49994 DEFAULT_EAT_SECONDS F - METHOD (IFZFLjava/util/List;)V + METHOD (IFZFLnet/minecraft/class_6880;Ljava/util/List;)V ARG 1 hunger ARG 2 saturationModifier ARG 3 meat diff --git a/mappings/net/minecraft/data/client/BlockStateModelGenerator.mapping b/mappings/net/minecraft/data/client/BlockStateModelGenerator.mapping index 428d1bea92..f5d65f5dab 100644 --- a/mappings/net/minecraft/data/client/BlockStateModelGenerator.mapping +++ b/mappings/net/minecraft/data/client/BlockStateModelGenerator.mapping @@ -15,16 +15,16 @@ CLASS net/minecraft/class_4910 net/minecraft/data/client/BlockStateModelGenerato ARG 1 blockStateCollector ARG 2 modelCollector ARG 3 simpleItemModelExemptionCollector - METHOD method_25508 registerChorusPlant ()V + METHOD method_25508 registerChorusPlant (Lnet/minecraft/class_2248;)V METHOD method_25509 registerComposter ()V - METHOD method_25510 registerDaylightDetector ()V - METHOD method_25512 registerFarmland ()V + METHOD method_25510 registerDaylightDetector (Lnet/minecraft/class_2248;)V + METHOD method_25512 registerFarmland (Lnet/minecraft/class_2248;Lnet/minecraft/class_2248;)V METHOD method_25513 registerFire ()V METHOD method_25514 registerSoulFire ()V METHOD method_25515 registerFrostedIce ()V METHOD method_25516 registerTopSoils ()V METHOD method_25517 registerCocoa ()V - METHOD method_25518 registerDirtPath ()V + METHOD method_25518 registerDirtPath (Lnet/minecraft/class_2248;)V METHOD method_25519 registerHopper ()V METHOD method_25520 registerIronBars ()V METHOD method_25521 registerLever ()V @@ -341,7 +341,7 @@ CLASS net/minecraft/class_4910 net/minecraft/data/client/BlockStateModelGenerato METHOD method_25696 registerDispenserLikeOrientable (Lnet/minecraft/class_2248;)V ARG 1 block METHOD method_25697 registerSmoothStone ()V - METHOD method_25698 registerNetherrackBottomCustomTop (Lnet/minecraft/class_2248;)V + METHOD method_25698 registerNetherrackBottomCustomTop (Lnet/minecraft/class_2248;Lnet/minecraft/class_2248;)V ARG 1 block METHOD method_25699 registerBrewingStand ()V METHOD method_25700 getFireFloorModels (Lnet/minecraft/class_2248;)Ljava/util/List; @@ -368,8 +368,7 @@ CLASS net/minecraft/class_4910 net/minecraft/data/client/BlockStateModelGenerato ARG 1 orientation ARG 2 variant METHOD method_26434 registerJigsaw ()V - METHOD method_27166 registerCampfire ([Lnet/minecraft/class_2248;)V - ARG 1 blocks + METHOD method_27166 registerCampfire (Lnet/minecraft/class_2248;[Lnet/minecraft/class_2248;)V METHOD method_31063 registerAxisRotated (Lnet/minecraft/class_2248;Lnet/minecraft/class_2960;)V ARG 1 block ARG 2 modelId @@ -381,10 +380,8 @@ CLASS net/minecraft/class_4910 net/minecraft/data/client/BlockStateModelGenerato ARG 2 cake METHOD method_32229 registerAmethyst (Lnet/minecraft/class_2248;)V ARG 1 block - METHOD method_32802 registerPointedDripstone ()V - METHOD method_32803 getDripstoneVariant (Lnet/minecraft/class_2350;Lnet/minecraft/class_5691;)Lnet/minecraft/class_4935; - ARG 1 direction - ARG 2 thickness + METHOD method_32802 registerPointedDripstone (Lnet/minecraft/class_2248;)V + METHOD method_32803 getDripstoneVariant (Lnet/minecraft/class_2248;Lnet/minecraft/class_2350;Lnet/minecraft/class_5691;)Lnet/minecraft/class_4935; METHOD method_33128 registerSculkSensor ()V METHOD method_33504 registerPetrifiedOakSlab ()V METHOD method_33509 (Lnet/minecraft/class_4944;)V @@ -423,8 +420,6 @@ CLASS net/minecraft/class_4910 net/minecraft/data/client/BlockStateModelGenerato ARG 0 textures METHOD method_34624 (Lnet/minecraft/class_4944;Lnet/minecraft/class_2960;)Lnet/minecraft/class_4944; ARG 1 id - METHOD method_34625 (Lnet/minecraft/class_2960;Ljava/lang/Integer;)Lnet/minecraft/class_4935; - ARG 1 height METHOD method_34626 (Lnet/minecraft/class_2960;Lnet/minecraft/class_4944;)V ARG 1 textures METHOD method_34627 (Lnet/minecraft/class_2960;Lnet/minecraft/class_2960;Lnet/minecraft/class_5705;)Lnet/minecraft/class_4935; diff --git a/mappings/net/minecraft/data/server/loottable/vanilla/VanillaBlockLootTableGenerator.mapping b/mappings/net/minecraft/data/server/loottable/vanilla/VanillaBlockLootTableGenerator.mapping index 450aa12a85..0868e07e5c 100644 --- a/mappings/net/minecraft/data/server/loottable/vanilla/VanillaBlockLootTableGenerator.mapping +++ b/mappings/net/minecraft/data/server/loottable/vanilla/VanillaBlockLootTableGenerator.mapping @@ -305,8 +305,6 @@ CLASS net/minecraft/class_2430 net/minecraft/data/server/loottable/vanilla/Vanil ARG 1 block METHOD method_46161 (Lnet/minecraft/class_1935;)Lnet/minecraft/class_52$class_53; ARG 0 block - METHOD method_46162 (Lnet/minecraft/class_2430;Lnet/minecraft/class_2248;)Lnet/minecraft/class_52$class_53; - ARG 1 block METHOD method_46163 (Lnet/minecraft/class_1935;)Lnet/minecraft/class_52$class_53; ARG 0 block METHOD method_46164 (Lnet/minecraft/class_2430;Lnet/minecraft/class_2248;)Lnet/minecraft/class_52$class_53; @@ -367,32 +365,24 @@ CLASS net/minecraft/class_2430 net/minecraft/data/server/loottable/vanilla/Vanil ARG 1 block METHOD method_49928 (Ljava/lang/Integer;)Lnet/minecraft/class_79$class_80; ARG 0 age - METHOD method_49929 (Lnet/minecraft/class_2430;Lnet/minecraft/class_2248;)Lnet/minecraft/class_52$class_53; - ARG 1 block METHOD method_49930 (Lnet/minecraft/class_2430;Lnet/minecraft/class_2248;)Lnet/minecraft/class_52$class_53; ARG 1 block METHOD method_49931 (Lnet/minecraft/class_2430;Lnet/minecraft/class_2248;)Lnet/minecraft/class_52$class_53; ARG 1 block METHOD method_49932 (Lnet/minecraft/class_2430;Lnet/minecraft/class_2248;)Lnet/minecraft/class_52$class_53; ARG 1 block - METHOD method_49933 (Lnet/minecraft/class_2430;Lnet/minecraft/class_2248;)Lnet/minecraft/class_52$class_53; - ARG 1 block METHOD method_49934 (Lnet/minecraft/class_2430;Lnet/minecraft/class_2248;)Lnet/minecraft/class_52$class_53; ARG 1 block METHOD method_49935 (Lnet/minecraft/class_2430;Lnet/minecraft/class_2248;)Lnet/minecraft/class_52$class_53; ARG 1 block METHOD method_49936 (Lnet/minecraft/class_2430;Lnet/minecraft/class_2248;)Lnet/minecraft/class_52$class_53; ARG 1 block - METHOD method_49937 (Lnet/minecraft/class_2430;Lnet/minecraft/class_2248;)Lnet/minecraft/class_52$class_53; - ARG 1 block METHOD method_49938 (Lnet/minecraft/class_2430;Lnet/minecraft/class_2248;)Lnet/minecraft/class_52$class_53; ARG 1 block METHOD method_49939 (Lnet/minecraft/class_2430;Lnet/minecraft/class_2248;)Lnet/minecraft/class_52$class_53; ARG 1 block METHOD method_49940 (Lnet/minecraft/class_2430;Lnet/minecraft/class_2248;)Lnet/minecraft/class_52$class_53; ARG 1 block - METHOD method_49941 (Lnet/minecraft/class_2430;Lnet/minecraft/class_2248;)Lnet/minecraft/class_52$class_53; - ARG 1 block METHOD method_49942 (Lnet/minecraft/class_2430;Lnet/minecraft/class_2248;)Lnet/minecraft/class_52$class_53; ARG 1 block METHOD method_49943 (Lnet/minecraft/class_2430;Lnet/minecraft/class_2248;)Lnet/minecraft/class_52$class_53; diff --git a/mappings/net/minecraft/entity/Entity.mapping b/mappings/net/minecraft/entity/Entity.mapping index 6458ce0aa8..caffa0795e 100644 --- a/mappings/net/minecraft/entity/Entity.mapping +++ b/mappings/net/minecraft/entity/Entity.mapping @@ -216,16 +216,13 @@ CLASS net/minecraft/class_1297 net/minecraft/entity/Entity FIELD field_6037 velocityModified Z 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 METHOD method_17681 getWidth ()F COMMENT {@return the width of the entity's current dimension} METHOD method_17682 getHeight ()F COMMENT {@return the height of the entity's current dimension} - METHOD method_17835 adjustMovementForCollisions (Lnet/minecraft/class_243;)Lnet/minecraft/class_243; + METHOD method_17835 adjustMovementForCollisions (Lnet/minecraft/class_243;)Lnet/minecraft/class_1297$class_9494; ARG 1 movement METHOD method_18002 createSpawnPacket ()Lnet/minecraft/class_2596; COMMENT {@return a packet to notify the clients of the entity's spawning} @@ -320,7 +317,7 @@ CLASS net/minecraft/class_1297 net/minecraft/entity/Entity ARG 1 destX ARG 3 destY ARG 5 destZ - METHOD method_20736 adjustMovementForCollisions (Lnet/minecraft/class_1297;Lnet/minecraft/class_243;Lnet/minecraft/class_238;Lnet/minecraft/class_1937;Ljava/util/List;)Lnet/minecraft/class_243; + METHOD method_20736 adjustMovementForCollisions (Lnet/minecraft/class_1297;Lnet/minecraft/class_243;Lnet/minecraft/class_238;Lnet/minecraft/class_1937;Ljava/util/List;)Lnet/minecraft/class_1297$class_9494; ARG 0 entity ARG 1 movement ARG 2 entityBoundingBox @@ -494,7 +491,7 @@ CLASS net/minecraft/class_1297 net/minecraft/entity/Entity COMMENT @see #getDefaultPortalCooldown METHOD method_30230 hasPortalCooldown ()Z COMMENT {@return whether the entity's portal cooldown is in effect} - METHOD method_30329 getTeleportTarget (Lnet/minecraft/class_3218;)Lnet/minecraft/class_5454; + METHOD method_30329 getTeleportTarget (Lnet/minecraft/class_3218;Z)Lnet/minecraft/class_5454; COMMENT {@return a {@link TeleportTarget} for the entity based on its current and COMMENT destination worlds, plus any nether portals that may be present} ARG 1 destination @@ -1552,7 +1549,7 @@ CLASS net/minecraft/class_1297 net/minecraft/entity/Entity COMMENT Sets the entity on fire from lava, applies lava damage, and plays the burning sound. COMMENT COMMENT @implNote Fire from lava lasts 15 seconds by default. - METHOD method_5731 moveToWorld (Lnet/minecraft/class_3218;)Lnet/minecraft/class_1297; + METHOD method_5731 moveToWorld (Lnet/minecraft/class_3218;Z)Lnet/minecraft/class_1297; COMMENT Moves this entity to another world. COMMENT COMMENT

Note all entities except server player entities are completely recreated at the destination. diff --git a/mappings/net/minecraft/entity/ExperienceOrbEntity.mapping b/mappings/net/minecraft/entity/ExperienceOrbEntity.mapping index bff1606002..6bb5342ab4 100644 --- a/mappings/net/minecraft/entity/ExperienceOrbEntity.mapping +++ b/mappings/net/minecraft/entity/ExperienceOrbEntity.mapping @@ -5,7 +5,7 @@ CLASS net/minecraft/class_1303 net/minecraft/entity/ExperienceOrbEntity FIELD field_30058 MERGING_CHANCE_FRACTION I FIELD field_6159 amount I FIELD field_6161 health I - FIELD field_6162 target Lnet/minecraft/class_1657; + FIELD field_6162 target Lnet/minecraft/class_1303$class_9497; FIELD field_6164 orbAge I METHOD (Lnet/minecraft/class_1937;DDDI)V ARG 1 world diff --git a/mappings/net/minecraft/entity/LivingEntity.mapping b/mappings/net/minecraft/entity/LivingEntity.mapping index 41cfb5c00b..1b20be89a0 100644 --- a/mappings/net/minecraft/entity/LivingEntity.mapping +++ b/mappings/net/minecraft/entity/LivingEntity.mapping @@ -172,7 +172,7 @@ CLASS net/minecraft/class_1309 net/minecraft/entity/LivingEntity COMMENT

The default behavior spawns a wither rose if {@code adversary} is a {@code WitherEntity}. ARG 1 adversary COMMENT the main adversary responsible for this entity's death - METHOD method_23883 dropXp ()V + METHOD method_23883 dropXp (Lnet/minecraft/class_1282;)V COMMENT Drops experience when this entity is killed. COMMENT COMMENT

To control the details of experience dropping, consider overriding @@ -674,4 +674,5 @@ CLASS net/minecraft/class_1309 net/minecraft/entity/LivingEntity METHOD method_6132 applyArmorToDamage (Lnet/minecraft/class_1282;F)F ARG 1 source ARG 2 amount + METHOD method_7329 dropItem (Lnet/minecraft/class_1799;ZZ)Lnet/minecraft/class_1542; CLASS class_6823 FallSounds diff --git a/mappings/net/minecraft/entity/ai/goal/MeleeAttackGoal.mapping b/mappings/net/minecraft/entity/ai/goal/MeleeAttackGoal.mapping index 689444af21..dca72904bf 100644 --- a/mappings/net/minecraft/entity/ai/goal/MeleeAttackGoal.mapping +++ b/mappings/net/minecraft/entity/ai/goal/MeleeAttackGoal.mapping @@ -11,10 +11,6 @@ CLASS net/minecraft/class_1366 net/minecraft/entity/ai/goal/MeleeAttackGoal FIELD field_6507 targetY D FIELD field_6508 targetX D FIELD field_6509 path Lnet/minecraft/class_11; - METHOD (Lnet/minecraft/class_1314;DZ)V - ARG 1 mob - ARG 2 speed - ARG 4 pauseWhenMobIdle METHOD method_28346 resetCooldown ()V METHOD method_28347 isCooledDown ()Z METHOD method_28348 getCooldown ()I diff --git a/mappings/net/minecraft/entity/ai/goal/ZombieAttackGoal.mapping b/mappings/net/minecraft/entity/ai/goal/ZombieAttackGoal.mapping index cb53b39ff2..66dd86f3a2 100644 --- a/mappings/net/minecraft/entity/ai/goal/ZombieAttackGoal.mapping +++ b/mappings/net/minecraft/entity/ai/goal/ZombieAttackGoal.mapping @@ -1,7 +1,3 @@ CLASS net/minecraft/class_1396 net/minecraft/entity/ai/goal/ZombieAttackGoal FIELD field_6627 ticks I - FIELD field_6628 zombie Lnet/minecraft/class_1642; - METHOD (Lnet/minecraft/class_1642;DZ)V - ARG 1 zombie - ARG 2 speed - ARG 4 pauseWhenMobIdle + FIELD field_6628 zombie Lnet/minecraft/class_1314; diff --git a/mappings/net/minecraft/entity/boss/BossBar.mapping b/mappings/net/minecraft/entity/boss/BossBar.mapping index cb8f974dd4..b00c897c63 100644 --- a/mappings/net/minecraft/entity/boss/BossBar.mapping +++ b/mappings/net/minecraft/entity/boss/BossBar.mapping @@ -7,7 +7,7 @@ CLASS net/minecraft/class_1259 net/minecraft/entity/boss/BossBar FIELD field_5777 name Lnet/minecraft/class_2561; FIELD field_5778 color Lnet/minecraft/class_1259$class_1260; FIELD field_5779 style Lnet/minecraft/class_1259$class_1261; - METHOD (Ljava/util/UUID;Lnet/minecraft/class_2561;Lnet/minecraft/class_1259$class_1260;Lnet/minecraft/class_1259$class_1261;)V + METHOD (Ljava/util/UUID;Lnet/minecraft/class_2561;Lnet/minecraft/class_1259$class_1260;Lnet/minecraft/class_1259$class_1261;Lnet/minecraft/class_243;I)V ARG 1 uuid ARG 2 name ARG 3 color diff --git a/mappings/net/minecraft/entity/passive/SheepEntity.mapping b/mappings/net/minecraft/entity/passive/SheepEntity.mapping index 98492ef7cc..941c0095df 100644 --- a/mappings/net/minecraft/entity/passive/SheepEntity.mapping +++ b/mappings/net/minecraft/entity/passive/SheepEntity.mapping @@ -24,7 +24,6 @@ CLASS net/minecraft/class_1472 net/minecraft/entity/passive/SheepEntity ARG 0 random METHOD method_6633 getColor ()Lnet/minecraft/class_1767; METHOD method_6634 getRgbColor (Lnet/minecraft/class_1767;)[F - ARG 0 dyeColor METHOD method_6635 setSheared (Z)V ARG 1 sheared METHOD method_6637 (Ljava/util/EnumMap;)V diff --git a/mappings/net/minecraft/entity/player/PlayerEntity.mapping b/mappings/net/minecraft/entity/player/PlayerEntity.mapping index 98034f8108..e8ac4ad7b8 100644 --- a/mappings/net/minecraft/entity/player/PlayerEntity.mapping +++ b/mappings/net/minecraft/entity/player/PlayerEntity.mapping @@ -289,14 +289,6 @@ CLASS net/minecraft/class_1657 net/minecraft/entity/player/PlayerEntity METHOD method_7326 doesNotSuffocate (Lnet/minecraft/class_2338;)Z ARG 1 pos METHOD method_7327 getScoreboard ()Lnet/minecraft/class_269; - METHOD method_7328 dropItem (Lnet/minecraft/class_1799;Z)Lnet/minecraft/class_1542; - ARG 1 stack - ARG 2 retainOwnership - METHOD method_7329 dropItem (Lnet/minecraft/class_1799;ZZ)Lnet/minecraft/class_1542; - ARG 1 stack - ARG 2 throwRandomly - COMMENT if true, the item will be thrown in a random direction from the entity regardless of which direction the entity is facing - ARG 3 retainOwnership METHOD method_7330 updateTurtleHelmet ()V METHOD method_7331 requestRespawn ()V METHOD method_7332 canConsume (Z)Z diff --git a/mappings/net/minecraft/entity/projectile/FireballEntity.mapping b/mappings/net/minecraft/entity/projectile/FireballEntity.mapping index b4c7a3b204..39f0079196 100644 --- a/mappings/net/minecraft/entity/projectile/FireballEntity.mapping +++ b/mappings/net/minecraft/entity/projectile/FireballEntity.mapping @@ -1,6 +1,6 @@ CLASS net/minecraft/class_1674 net/minecraft/entity/projectile/FireballEntity FIELD field_7624 explosionPower I - METHOD (Lnet/minecraft/class_1937;Lnet/minecraft/class_1309;DDDI)V + METHOD (Lnet/minecraft/class_1937;Lnet/minecraft/class_1309;DDDIZ)V ARG 1 world ARG 2 owner ARG 3 velocityX diff --git a/mappings/net/minecraft/item/Item.mapping b/mappings/net/minecraft/item/Item.mapping index f380a38b7e..3d91a327a6 100644 --- a/mappings/net/minecraft/item/Item.mapping +++ b/mappings/net/minecraft/item/Item.mapping @@ -45,8 +45,6 @@ CLASS net/minecraft/class_1792 net/minecraft/item/Item COMMENT Such items must subclass {@link NetworkSyncedItem}. COMMENT COMMENT @see NetworkSyncedItem - METHOD method_21830 getEatSound ()Lnet/minecraft/class_3414; - COMMENT {@return the sound for eating the item} METHOD method_21831 getDrinkSound ()Lnet/minecraft/class_3414; COMMENT {@return the sound for drinking the item} METHOD method_31565 onStackClicked (Lnet/minecraft/class_1799;Lnet/minecraft/class_1735;Lnet/minecraft/class_5536;Lnet/minecraft/class_1657;)Z diff --git a/mappings/net/minecraft/item/Items.mapping b/mappings/net/minecraft/item/Items.mapping index e5d8220a4d..f89e91810e 100644 --- a/mappings/net/minecraft/item/Items.mapping +++ b/mappings/net/minecraft/item/Items.mapping @@ -880,23 +880,15 @@ CLASS net/minecraft/class_1802 net/minecraft/item/Items METHOD method_51348 register (Lnet/minecraft/class_5321;Lnet/minecraft/class_1792;)Lnet/minecraft/class_1792; ARG 0 key ARG 1 item - METHOD method_58095 (Lnet/minecraft/class_1792$class_1793;)Lnet/minecraft/class_1792$class_1793; - ARG 0 settings METHOD method_58096 register (Lnet/minecraft/class_2248;Ljava/util/function/UnaryOperator;)Lnet/minecraft/class_1792; ARG 0 block ARG 1 settingsOperator - METHOD method_58097 (Lnet/minecraft/class_1792$class_1793;)Lnet/minecraft/class_1792$class_1793; - ARG 0 settings METHOD method_58098 (Lnet/minecraft/class_1792$class_1793;)Lnet/minecraft/class_1792$class_1793; ARG 0 settings METHOD method_58099 (Lnet/minecraft/class_1792$class_1793;)Lnet/minecraft/class_1792$class_1793; ARG 0 settings - METHOD method_58100 (Lnet/minecraft/class_1792$class_1793;)Lnet/minecraft/class_1792$class_1793; - ARG 0 settings METHOD method_58101 (Lnet/minecraft/class_1792$class_1793;)Lnet/minecraft/class_1792$class_1793; ARG 0 settings - METHOD method_58103 (Lnet/minecraft/class_1792$class_1793;)Lnet/minecraft/class_1792$class_1793; - ARG 0 settings METHOD method_58104 (Lnet/minecraft/class_1792$class_1793;)Lnet/minecraft/class_1792$class_1793; ARG 0 settings METHOD method_58105 (Lnet/minecraft/class_1792$class_1793;)Lnet/minecraft/class_1792$class_1793; diff --git a/mappings/net/minecraft/network/codec/PacketCodec.mapping b/mappings/net/minecraft/network/codec/PacketCodec.mapping index e8c04c38b0..2c4dd33085 100644 --- a/mappings/net/minecraft/network/codec/PacketCodec.mapping +++ b/mappings/net/minecraft/network/codec/PacketCodec.mapping @@ -167,7 +167,7 @@ CLASS net/minecraft/class_9139 net/minecraft/network/codec/PacketCodec ARG 10 codec6 ARG 11 from6 ARG 12 to - CLASS 5 + CLASS 6 FIELD field_49712 codecSupplier Ljava/util/function/Supplier; CLASS class_9140 ResultFunction METHOD apply (Lnet/minecraft/class_9139;)Lnet/minecraft/class_9139; diff --git a/mappings/net/minecraft/network/codec/PacketCodecs.mapping b/mappings/net/minecraft/network/codec/PacketCodecs.mapping index 0cb28a5bf3..deac49a61b 100644 --- a/mappings/net/minecraft/network/codec/PacketCodecs.mapping +++ b/mappings/net/minecraft/network/codec/PacketCodecs.mapping @@ -289,27 +289,19 @@ CLASS net/minecraft/class_9135 net/minecraft/network/codec/PacketCodecs ARG 0 registryRef METHOD method_58002 unlimitedRegistryCodec (Lcom/mojang/serialization/Codec;)Lnet/minecraft/class_9139; ARG 0 codec - CLASS 10 CLASS 11 - METHOD method_58007 (Lnet/minecraft/class_9139;Lio/netty/buffer/ByteBuf;Lnet/minecraft/class_9139;Ljava/lang/Object;Ljava/lang/Object;)V - ARG 3 k - ARG 4 v CLASS 13 + CLASS 14 METHOD method_58010 (Lio/netty/buffer/ByteBuf;Lnet/minecraft/class_9139;Ljava/lang/Object;)V ARG 2 right METHOD method_58011 (Lio/netty/buffer/ByteBuf;Lnet/minecraft/class_9139;Ljava/lang/Object;)V ARG 2 left - CLASS 15 + CLASS 16 METHOD method_56424 getIterable (Lnet/minecraft/class_9129;)Lnet/minecraft/class_2359; ARG 1 buf - CLASS 16 - FIELD field_48562 DIRECT_ENTRY_MARKER I - METHOD method_56390 getEntries (Lnet/minecraft/class_9129;)Lnet/minecraft/class_2359; - ARG 1 buf CLASS 17 - FIELD field_49689 DIRECT_ENTRY_MARKER I - FIELD field_49690 entryPacketCodec Lnet/minecraft/class_9139; CLASS 18 + CLASS 19 FIELD field_49691 NAME_MAX_LENGTH I FIELD field_49692 VALUE_MAX_LENGTH I FIELD field_49693 SIGNATURE_MAX_LENGTH I @@ -323,15 +315,7 @@ CLASS net/minecraft/class_9135 net/minecraft/network/codec/PacketCodecs METHOD method_56403 decode (Lio/netty/buffer/ByteBuf;)[B ARG 1 buf METHOD method_56404 encode (Lio/netty/buffer/ByteBuf;[B)V - ARG 1 buf - ARG 2 value - CLASS 27 - METHOD method_56407 read (Lio/netty/buffer/ByteBuf;)[B - ARG 1 buf - METHOD method_56408 write (Lio/netty/buffer/ByteBuf;[B)V - ARG 1 buf - ARG 2 bytes - CLASS 5 + CLASS 6 METHOD method_56899 (Ljava/lang/Object;Ljava/lang/String;)Lio/netty/handler/codec/EncoderException; ARG 1 error METHOD method_56900 (Lnet/minecraft/class_2520;Ljava/lang/String;)Lio/netty/handler/codec/DecoderException; diff --git a/mappings/net/minecraft/network/packet/s2c/play/BossBarS2CPacket.mapping b/mappings/net/minecraft/network/packet/s2c/play/BossBarS2CPacket.mapping index 294229efec..5420a7d4bb 100644 --- a/mappings/net/minecraft/network/packet/s2c/play/BossBarS2CPacket.mapping +++ b/mappings/net/minecraft/network/packet/s2c/play/BossBarS2CPacket.mapping @@ -56,7 +56,7 @@ CLASS net/minecraft/class_2629 net/minecraft/network/packet/s2c/play/BossBarS2CP METHOD method_34102 updateName (Ljava/util/UUID;Lnet/minecraft/class_2561;)V ARG 1 uuid ARG 2 name - METHOD method_34103 add (Ljava/util/UUID;Lnet/minecraft/class_2561;FLnet/minecraft/class_1259$class_1260;Lnet/minecraft/class_1259$class_1261;ZZZ)V + METHOD method_34103 add (Ljava/util/UUID;Lnet/minecraft/class_2561;FLnet/minecraft/class_1259$class_1260;Lnet/minecraft/class_1259$class_1261;ZZZLnet/minecraft/class_243;I)V ARG 1 uuid ARG 2 name ARG 3 percent diff --git a/mappings/net/minecraft/screen/slot/FurnaceOutputSlot.mapping b/mappings/net/minecraft/screen/slot/FurnaceOutputSlot.mapping index dd9ef6ee92..037be45710 100644 --- a/mappings/net/minecraft/screen/slot/FurnaceOutputSlot.mapping +++ b/mappings/net/minecraft/screen/slot/FurnaceOutputSlot.mapping @@ -7,3 +7,4 @@ CLASS net/minecraft/class_1719 net/minecraft/screen/slot/FurnaceOutputSlot ARG 3 index ARG 4 x ARG 5 y + METHOD method_7669 onCrafted (Lnet/minecraft/class_1799;)V diff --git a/mappings/net/minecraft/screen/slot/Slot.mapping b/mappings/net/minecraft/screen/slot/Slot.mapping index d99780f6ca..3cdbeafb6d 100644 --- a/mappings/net/minecraft/screen/slot/Slot.mapping +++ b/mappings/net/minecraft/screen/slot/Slot.mapping @@ -47,8 +47,6 @@ CLASS net/minecraft/class_1735 net/minecraft/screen/slot/Slot ARG 1 player ARG 2 stack METHOD method_7668 markDirty ()V - METHOD method_7669 onCrafted (Lnet/minecraft/class_1799;)V - ARG 1 stack METHOD method_7670 onQuickTransfer (Lnet/minecraft/class_1799;Lnet/minecraft/class_1799;)V ARG 1 newItem ARG 2 original diff --git a/mappings/net/minecraft/server/world/ServerWorld.mapping b/mappings/net/minecraft/server/world/ServerWorld.mapping index c9bdf35229..320ccb9a63 100644 --- a/mappings/net/minecraft/server/world/ServerWorld.mapping +++ b/mappings/net/minecraft/server/world/ServerWorld.mapping @@ -318,8 +318,6 @@ CLASS net/minecraft/class_3218 net/minecraft/server/world/ServerWorld COMMENT the classifier that determines the category of any item METHOD method_31418 getLightningRodPos (Lnet/minecraft/class_2338;)Ljava/util/Optional; ARG 1 pos - METHOD method_31420 (Lnet/minecraft/class_8921;Lnet/minecraft/class_3695;Lnet/minecraft/class_1297;)V - ARG 3 entity METHOD method_31421 (Lnet/minecraft/class_6880;)Z ARG 0 poiType METHOD method_31423 loadEntities (Ljava/util/stream/Stream;)V diff --git a/mappings/net/minecraft/structure/RuinedPortalStructurePiece.mapping b/mappings/net/minecraft/structure/RuinedPortalStructurePiece.mapping index c9b996bcc6..88ea238886 100644 --- a/mappings/net/minecraft/structure/RuinedPortalStructurePiece.mapping +++ b/mappings/net/minecraft/structure/RuinedPortalStructurePiece.mapping @@ -78,7 +78,7 @@ CLASS net/minecraft/class_5189 net/minecraft/structure/RuinedPortalStructurePiec FIELD field_24027 vines Z FIELD field_24028 replaceWithBlackstone Z FIELD field_24993 CODEC Lcom/mojang/serialization/Codec; - METHOD (ZFZZZZ)V + METHOD (ZFZZZZZ)V ARG 1 cold ARG 2 mossiness ARG 3 airPocket diff --git a/mappings/net/minecraft/structure/processor/BlockAgeStructureProcessor.mapping b/mappings/net/minecraft/structure/processor/BlockAgeStructureProcessor.mapping index f4d1bf40e5..f78a8d4b76 100644 --- a/mappings/net/minecraft/structure/processor/BlockAgeStructureProcessor.mapping +++ b/mappings/net/minecraft/structure/processor/BlockAgeStructureProcessor.mapping @@ -2,7 +2,7 @@ CLASS net/minecraft/class_5193 net/minecraft/structure/processor/BlockAgeStructu FIELD field_24042 mossiness F FIELD field_24997 CODEC Lcom/mojang/serialization/Codec; FIELD field_27338 AGEABLE_SLABS [Lnet/minecraft/class_2680; - METHOD (F)V + METHOD (FZ)V ARG 1 mossiness METHOD method_27256 processBlocks (Lnet/minecraft/class_5819;)Lnet/minecraft/class_2680; ARG 1 random @@ -25,5 +25,3 @@ CLASS net/minecraft/class_5193 net/minecraft/structure/processor/BlockAgeStructu ARG 1 random METHOD method_27263 processObsidian (Lnet/minecraft/class_5819;)Lnet/minecraft/class_2680; ARG 1 random - METHOD method_28967 (Lnet/minecraft/class_5193;)Ljava/lang/Float; - ARG 0 processor diff --git a/mappings/net/minecraft/text/MutableText.mapping b/mappings/net/minecraft/text/MutableText.mapping index 77061f64a5..603cc25286 100644 --- a/mappings/net/minecraft/text/MutableText.mapping +++ b/mappings/net/minecraft/text/MutableText.mapping @@ -11,10 +11,8 @@ CLASS net/minecraft/class_5250 net/minecraft/text/MutableText ARG 3 style METHOD equals (Ljava/lang/Object;)Z ARG 1 o - METHOD method_10852 append (Lnet/minecraft/class_2561;)Lnet/minecraft/class_5250; + METHOD method_10852 append ([Lnet/minecraft/class_2561;)Lnet/minecraft/class_5250; COMMENT Appends a text to this text's siblings. - ARG 1 text - COMMENT the sibling METHOD method_10862 setStyle (Lnet/minecraft/class_2583;)Lnet/minecraft/class_5250; COMMENT Sets the style of this text. ARG 1 style diff --git a/mappings/net/minecraft/unused/packageinfo/PackageInfo9518.mapping b/mappings/net/minecraft/unused/packageinfo/PackageInfo9518.mapping new file mode 100644 index 0000000000..63335d08e9 --- /dev/null +++ b/mappings/net/minecraft/unused/packageinfo/PackageInfo9518.mapping @@ -0,0 +1 @@ +CLASS net/minecraft/class_9518 net/minecraft/unused/packageinfo/PackageInfo9518 diff --git a/mappings/net/minecraft/unused/packageinfo/PackageInfo9601.mapping b/mappings/net/minecraft/unused/packageinfo/PackageInfo9601.mapping new file mode 100644 index 0000000000..baf8297b0b --- /dev/null +++ b/mappings/net/minecraft/unused/packageinfo/PackageInfo9601.mapping @@ -0,0 +1 @@ +CLASS net/minecraft/class_9601 net/minecraft/unused/packageinfo/PackageInfo9601 diff --git a/mappings/net/minecraft/util/CachedMapper.mapping b/mappings/net/minecraft/util/CachedMapper.mapping index 528f3a4837..cd20884200 100644 --- a/mappings/net/minecraft/util/CachedMapper.mapping +++ b/mappings/net/minecraft/util/CachedMapper.mapping @@ -5,9 +5,7 @@ CLASS net/minecraft/class_8105 net/minecraft/util/CachedMapper COMMENT @see Util#cachedMapper FIELD field_42269 mapper Ljava/util/function/Function; FIELD field_42270 cachedInput Ljava/lang/Object; - FIELD field_42271 cachedOutput Ljava/lang/Object; - METHOD (Ljava/util/function/Function;)V - ARG 1 mapper + FIELD field_42271 cachedOutput Lnet/minecraft/class_9631; METHOD method_48782 map (Ljava/lang/Object;)Ljava/lang/Object; COMMENT {@return the mapped {@code input}} ARG 1 input diff --git a/mappings/net/minecraft/util/dynamic/Codecs.mapping b/mappings/net/minecraft/util/dynamic/Codecs.mapping index 656a7c47cd..48998238e8 100644 --- a/mappings/net/minecraft/util/dynamic/Codecs.mapping +++ b/mappings/net/minecraft/util/dynamic/Codecs.mapping @@ -369,7 +369,7 @@ CLASS net/minecraft/class_5699 net/minecraft/util/dynamic/Codecs METHOD decode (Lcom/mojang/serialization/DynamicOps;Ljava/lang/Object;)Lcom/mojang/serialization/DataResult; ARG 1 ops ARG 2 input - CLASS 6 + CLASS 7 METHOD decode (Lcom/mojang/serialization/DynamicOps;Lcom/mojang/serialization/MapLike;)Lcom/mojang/serialization/DataResult; ARG 1 ops ARG 2 input @@ -385,7 +385,7 @@ CLASS net/minecraft/class_5699 net/minecraft/util/dynamic/Codecs ARG 3 ops METHOD method_54943 (Lcom/mojang/serialization/MapLike;Ljava/lang/String;Lcom/mojang/serialization/DynamicOps;Ljava/util/function/Function;Lcom/mojang/datafixers/util/Pair;)Lcom/mojang/serialization/DataResult; ARG 4 pair - CLASS 7 + CLASS 8 METHOD decode (Lcom/mojang/serialization/DynamicOps;Ljava/lang/Object;)Lcom/mojang/serialization/DataResult; ARG 1 ops ARG 2 input @@ -417,7 +417,7 @@ CLASS net/minecraft/class_5699 net/minecraft/util/dynamic/Codecs ARG 1 error METHOD method_57168 (Ljava/util/Map;Ljava/lang/Object;Lcom/mojang/datafixers/util/Unit;)Lcom/mojang/datafixers/util/Pair; ARG 2 unit - CLASS 8 + CLASS 9 METHOD decode (Lcom/mojang/serialization/DynamicOps;Ljava/lang/Object;)Lcom/mojang/serialization/DataResult; ARG 1 ops ARG 2 input diff --git a/mappings/net/minecraft/world/CollisionView.mapping b/mappings/net/minecraft/world/CollisionView.mapping index fbfc191c04..414f8c4c84 100644 --- a/mappings/net/minecraft/world/CollisionView.mapping +++ b/mappings/net/minecraft/world/CollisionView.mapping @@ -40,9 +40,6 @@ CLASS net/minecraft/class_1941 net/minecraft/world/CollisionView METHOD method_52569 isBlockSpaceEmpty (Lnet/minecraft/class_1297;Lnet/minecraft/class_238;)Z ARG 1 entity ARG 2 box - METHOD method_8587 isSpaceEmpty (Lnet/minecraft/class_1297;Lnet/minecraft/class_238;)Z - ARG 1 entity - ARG 2 box METHOD method_8600 getCollisions (Lnet/minecraft/class_1297;Lnet/minecraft/class_238;)Ljava/lang/Iterable; ARG 1 entity ARG 2 box diff --git a/mappings/net/minecraft/world/gen/carver/Carver.mapping b/mappings/net/minecraft/world/gen/carver/Carver.mapping index 08d0d88d55..e7e80aa798 100644 --- a/mappings/net/minecraft/world/gen/carver/Carver.mapping +++ b/mappings/net/minecraft/world/gen/carver/Carver.mapping @@ -28,8 +28,6 @@ CLASS net/minecraft/class_2939 net/minecraft/world/gen/carver/Carver ARG 2 state METHOD method_12710 getBranchFactor ()I METHOD method_16581 carveAtPoint (Lnet/minecraft/class_5873;Lnet/minecraft/class_5871;Lnet/minecraft/class_2791;Ljava/util/function/Function;Lnet/minecraft/class_6643;Lnet/minecraft/class_2338$class_2339;Lnet/minecraft/class_2338$class_2339;Lnet/minecraft/class_6350;Lorg/apache/commons/lang3/mutable/MutableBoolean;)Z - ARG 1 context - ARG 2 config ARG 3 chunk ARG 4 posToBiome ARG 5 mask diff --git a/mappings/net/minecraft/world/gen/chunk/ChunkGeneratorSettings.mapping b/mappings/net/minecraft/world/gen/chunk/ChunkGeneratorSettings.mapping index 49a05aa703..69c64e7b70 100644 --- a/mappings/net/minecraft/world/gen/chunk/ChunkGeneratorSettings.mapping +++ b/mappings/net/minecraft/world/gen/chunk/ChunkGeneratorSettings.mapping @@ -17,7 +17,7 @@ CLASS net/minecraft/class_5284 net/minecraft/world/gen/chunk/ChunkGeneratorSetti FIELD field_26359 CAVES Lnet/minecraft/class_5321; FIELD field_26360 FLOATING_ISLANDS Lnet/minecraft/class_5321; FIELD field_35051 LARGE_BIOMES Lnet/minecraft/class_5321; - METHOD (Lnet/minecraft/class_5309;Lnet/minecraft/class_2680;Lnet/minecraft/class_2680;Lnet/minecraft/class_6953;Lnet/minecraft/class_6686$class_6708;Ljava/util/List;IZZZZ)V + METHOD (Lnet/minecraft/class_5309;Lnet/minecraft/class_2680;Lnet/minecraft/class_2680;Lnet/minecraft/class_6953;Lnet/minecraft/class_6686$class_6708;Ljava/util/List;IIZZZZ)V ARG 5 surfaceRule METHOD comp_474 generationShapeConfig ()Lnet/minecraft/class_5309; METHOD comp_475 defaultBlock ()Lnet/minecraft/class_2680; diff --git a/mappings/net/minecraft/world/gen/feature/BasaltColumnsFeature.mapping b/mappings/net/minecraft/world/gen/feature/BasaltColumnsFeature.mapping index 424242072f..e2f4f45840 100644 --- a/mappings/net/minecraft/world/gen/feature/BasaltColumnsFeature.mapping +++ b/mappings/net/minecraft/world/gen/feature/BasaltColumnsFeature.mapping @@ -9,7 +9,7 @@ CLASS net/minecraft/class_5153 net/minecraft/world/gen/feature/BasaltColumnsFeat ARG 0 world ARG 1 seaLevel ARG 2 pos - METHOD method_27096 placeBasaltColumn (Lnet/minecraft/class_1936;ILnet/minecraft/class_2338;II)Z + METHOD method_27096 placeBasaltColumn (Lnet/minecraft/class_1936;ILnet/minecraft/class_2338;IILnet/minecraft/class_2680;)Z ARG 1 world ARG 2 seaLevel ARG 3 pos diff --git a/mappings/net/minecraft/world/gen/feature/BasaltColumnsFeatureConfig.mapping b/mappings/net/minecraft/world/gen/feature/BasaltColumnsFeatureConfig.mapping index 8549b8afc7..1b4408be7a 100644 --- a/mappings/net/minecraft/world/gen/feature/BasaltColumnsFeatureConfig.mapping +++ b/mappings/net/minecraft/world/gen/feature/BasaltColumnsFeatureConfig.mapping @@ -2,9 +2,6 @@ CLASS net/minecraft/class_5156 net/minecraft/world/gen/feature/BasaltColumnsFeat FIELD field_24877 CODEC Lcom/mojang/serialization/Codec; FIELD field_25841 reach Lnet/minecraft/class_6017; FIELD field_25842 height Lnet/minecraft/class_6017; - METHOD (Lnet/minecraft/class_6017;Lnet/minecraft/class_6017;)V - ARG 1 reach - ARG 2 height METHOD method_30391 getReach ()Lnet/minecraft/class_6017; METHOD method_30392 (Lnet/minecraft/class_5156;)Lnet/minecraft/class_6017; ARG 0 config diff --git a/mappings/net/minecraft/world/gen/feature/DefaultBiomeFeatures.mapping b/mappings/net/minecraft/world/gen/feature/DefaultBiomeFeatures.mapping index a8e11a7f38..ab753863ea 100644 --- a/mappings/net/minecraft/world/gen/feature/DefaultBiomeFeatures.mapping +++ b/mappings/net/minecraft/world/gen/feature/DefaultBiomeFeatures.mapping @@ -79,7 +79,7 @@ CLASS net/minecraft/class_3864 net/minecraft/world/gen/feature/DefaultBiomeFeatu ARG 0 builder METHOD method_17005 addMineables (Lnet/minecraft/class_5485$class_5495;)V ARG 0 builder - METHOD method_17006 addDefaultOres (Lnet/minecraft/class_5485$class_5495;Z)V + METHOD method_17006 addDefaultOres (Lnet/minecraft/class_5485$class_5495;ZZ)V ARG 0 builder ARG 1 largeCopperOreBlob METHOD method_17007 addExtraGoldOre (Lnet/minecraft/class_5485$class_5495;)V diff --git a/mappings/net/minecraft/world/gen/feature/LargeDripstoneFeature.mapping b/mappings/net/minecraft/world/gen/feature/LargeDripstoneFeature.mapping index 3c4829fa9c..c9f0d32e3e 100644 --- a/mappings/net/minecraft/world/gen/feature/LargeDripstoneFeature.mapping +++ b/mappings/net/minecraft/world/gen/feature/LargeDripstoneFeature.mapping @@ -28,10 +28,7 @@ CLASS net/minecraft/class_5727 net/minecraft/world/gen/feature/LargeDripstoneFea METHOD method_33019 canGenerate (Lnet/minecraft/class_5281;Lnet/minecraft/class_5727$class_5729;)Z ARG 1 world ARG 2 wind - METHOD method_33020 generate (Lnet/minecraft/class_5281;Lnet/minecraft/class_5819;Lnet/minecraft/class_5727$class_5729;)V - ARG 1 world - ARG 2 random - ARG 3 wind + METHOD method_33020 generate (Lnet/minecraft/class_5689;Lnet/minecraft/class_5281;Lnet/minecraft/class_5819;Lnet/minecraft/class_5727$class_5729;)V METHOD method_33025 generateWind (Lnet/minecraft/class_5732;)Z ARG 1 config METHOD method_35361 getBottomY ()I diff --git a/mappings/net/minecraft/world/gen/feature/LargeDripstoneFeatureConfig.mapping b/mappings/net/minecraft/world/gen/feature/LargeDripstoneFeatureConfig.mapping index 7ea686a896..037d8f442f 100644 --- a/mappings/net/minecraft/world/gen/feature/LargeDripstoneFeatureConfig.mapping +++ b/mappings/net/minecraft/world/gen/feature/LargeDripstoneFeatureConfig.mapping @@ -9,7 +9,7 @@ CLASS net/minecraft/class_5732 net/minecraft/world/gen/feature/LargeDripstoneFea FIELD field_28234 windSpeed Lnet/minecraft/class_5863; FIELD field_28235 minRadiusForWind I FIELD field_28236 minBluntnessForWind F - METHOD (ILnet/minecraft/class_6017;Lnet/minecraft/class_5863;FLnet/minecraft/class_5863;Lnet/minecraft/class_5863;Lnet/minecraft/class_5863;IF)V + METHOD (ILnet/minecraft/class_6017;Lnet/minecraft/class_5863;FLnet/minecraft/class_5863;Lnet/minecraft/class_5863;Lnet/minecraft/class_5863;IFLnet/minecraft/class_5689;)V ARG 1 floorToCeilingSearchRange ARG 2 columnRadius ARG 3 heightScale diff --git a/mappings/net/minecraft/world/gen/placementmodifier/CountMultilayerPlacementModifier.mapping b/mappings/net/minecraft/world/gen/placementmodifier/CountMultilayerPlacementModifier.mapping index 18967e330c..7e3577c3b9 100644 --- a/mappings/net/minecraft/world/gen/placementmodifier/CountMultilayerPlacementModifier.mapping +++ b/mappings/net/minecraft/world/gen/placementmodifier/CountMultilayerPlacementModifier.mapping @@ -1,8 +1,6 @@ CLASS net/minecraft/class_5452 net/minecraft/world/gen/placementmodifier/CountMultilayerPlacementModifier FIELD field_35716 MODIFIER_CODEC Lcom/mojang/serialization/Codec; FIELD field_35717 count Lnet/minecraft/class_6017; - METHOD (Lnet/minecraft/class_6017;)V - ARG 1 count METHOD method_30472 blocksSpawn (Lnet/minecraft/class_2680;)Z ARG 0 state METHOD method_30473 findPos (Lnet/minecraft/class_5444;IIII)I diff --git a/mappings/net/minecraft/world/gen/structure/RuinedPortalStructure.mapping b/mappings/net/minecraft/world/gen/structure/RuinedPortalStructure.mapping index 321aaa1190..1a7cf53784 100644 --- a/mappings/net/minecraft/world/gen/structure/RuinedPortalStructure.mapping +++ b/mappings/net/minecraft/world/gen/structure/RuinedPortalStructure.mapping @@ -20,7 +20,7 @@ CLASS net/minecraft/class_5183 net/minecraft/world/gen/structure/RuinedPortalStr ARG 0 random ARG 1 min ARG 2 max - METHOD method_27211 getFloorHeight (Lnet/minecraft/class_5819;Lnet/minecraft/class_2794;Lnet/minecraft/class_5189$class_5191;ZIILnet/minecraft/class_3341;Lnet/minecraft/class_5539;Lnet/minecraft/class_7138;)I + METHOD method_27211 getFloorHeight (Lnet/minecraft/class_5819;Lnet/minecraft/class_2794;Lnet/minecraft/class_5189$class_5191;ZIILnet/minecraft/class_3341;Lnet/minecraft/class_5539;Lnet/minecraft/class_7138;Z)I ARG 0 random ARG 1 chunkGenerator ARG 2 verticalPlacement diff --git a/mappings/net/minecraft/world/gen/structure/Structure.mapping b/mappings/net/minecraft/world/gen/structure/Structure.mapping index c02f6607bf..7f0a220f57 100644 --- a/mappings/net/minecraft/world/gen/structure/Structure.mapping +++ b/mappings/net/minecraft/world/gen/structure/Structure.mapping @@ -34,7 +34,7 @@ CLASS net/minecraft/class_3195 net/minecraft/world/gen/structure/Structure METHOD method_41613 isBiomeValid (Lnet/minecraft/class_3195$class_7150;Lnet/minecraft/class_3195$class_7149;)Z ARG 0 result ARG 1 context - METHOD method_41614 createStructureStart (Lnet/minecraft/class_5455;Lnet/minecraft/class_2794;Lnet/minecraft/class_1966;Lnet/minecraft/class_7138;Lnet/minecraft/class_3485;JLnet/minecraft/class_1923;ILnet/minecraft/class_5539;Ljava/util/function/Predicate;)Lnet/minecraft/class_3449; + METHOD method_41614 createStructureStart (Lnet/minecraft/class_5455;Lnet/minecraft/class_2794;Lnet/minecraft/class_1966;Lnet/minecraft/class_7138;Lnet/minecraft/class_3485;JLnet/minecraft/class_1923;ILnet/minecraft/class_5539;Ljava/util/function/Predicate;Ljava/util/List;)Lnet/minecraft/class_3449; ARG 1 dynamicRegistryManager ARG 2 chunkGenerator ARG 3 biomeSource @@ -75,7 +75,7 @@ CLASS net/minecraft/class_3195 net/minecraft/world/gen/structure/Structure FIELD comp_564 noiseConfig Lnet/minecraft/class_7138; FIELD comp_569 world Lnet/minecraft/class_5539; FIELD comp_570 biomePredicate Ljava/util/function/Predicate; - METHOD (Lnet/minecraft/class_5455;Lnet/minecraft/class_2794;Lnet/minecraft/class_1966;Lnet/minecraft/class_7138;Lnet/minecraft/class_3485;JLnet/minecraft/class_1923;Lnet/minecraft/class_5539;Ljava/util/function/Predicate;)V + METHOD (Lnet/minecraft/class_5455;Lnet/minecraft/class_2794;Lnet/minecraft/class_1966;Lnet/minecraft/class_7138;Lnet/minecraft/class_3485;JLnet/minecraft/class_1923;Lnet/minecraft/class_5539;Ljava/util/function/Predicate;Ljava/util/List;)V ARG 1 dynamicRegistryManager ARG 2 chunkGenerator ARG 3 biomeSource diff --git a/mappings/net/minecraft/world/gen/structure/Structures.mapping b/mappings/net/minecraft/world/gen/structure/Structures.mapping index af02408eb9..679c6d8c09 100644 --- a/mappings/net/minecraft/world/gen/structure/Structures.mapping +++ b/mappings/net/minecraft/world/gen/structure/Structures.mapping @@ -8,8 +8,5 @@ CLASS net/minecraft/class_5470 net/minecraft/world/gen/structure/Structures METHOD method_42758 createConfig (Lnet/minecraft/class_6885;Lnet/minecraft/class_5847;)Lnet/minecraft/class_3195$class_7302; ARG 0 biomes ARG 1 terrainAdaptation - METHOD method_42759 createConfig (Lnet/minecraft/class_6885;Ljava/util/Map;Lnet/minecraft/class_2893$class_2895;Lnet/minecraft/class_5847;)Lnet/minecraft/class_3195$class_7302; + METHOD method_42759 createConfig (Lnet/minecraft/class_6885;Ljava/util/List;Ljava/util/Map;Lnet/minecraft/class_2893$class_2895;Lnet/minecraft/class_5847;)Lnet/minecraft/class_3195$class_7302; ARG 0 biomes - ARG 1 spawns - ARG 2 featureStep - ARG 3 terrainAdaptation diff --git a/mappings/net/minecraft/world/gen/treedecorator/AttachedToLeavesTreeDecorator.mapping b/mappings/net/minecraft/world/gen/treedecorator/AttachedToLeavesTreeDecorator.mapping index a5c68d6ceb..0f26da2f26 100644 --- a/mappings/net/minecraft/world/gen/treedecorator/AttachedToLeavesTreeDecorator.mapping +++ b/mappings/net/minecraft/world/gen/treedecorator/AttachedToLeavesTreeDecorator.mapping @@ -3,16 +3,11 @@ CLASS net/minecraft/class_7389 net/minecraft/world/gen/treedecorator/AttachedToL FIELD field_38784 probability F FIELD field_38785 exclusionRadiusXZ I FIELD field_38786 exclusionRadiusY I - FIELD field_38787 blockProvider Lnet/minecraft/class_4651; + FIELD field_38787 blockProvider Ljava/util/List; FIELD field_38788 requiredEmptyBlocks I FIELD field_38789 directions Ljava/util/List; - METHOD (FIILnet/minecraft/class_4651;ILjava/util/List;)V + METHOD (FZIILjava/util/List;ILjava/util/List;)V ARG 1 probability - ARG 2 exclusionRadiusXZ - ARG 3 exclusionRadiusY - ARG 4 blockProvider - ARG 5 requiredEmptyBlocks - ARG 6 directions METHOD method_43187 meetsRequiredEmptyBlocks (Lnet/minecraft/class_4662$class_7402;Lnet/minecraft/class_2338;Lnet/minecraft/class_2350;)Z ARG 1 generator ARG 2 pos @@ -21,8 +16,6 @@ CLASS net/minecraft/class_7389 net/minecraft/world/gen/treedecorator/AttachedToL ARG 0 treeDecorator METHOD method_43190 (Lnet/minecraft/class_7389;)Ljava/lang/Integer; ARG 0 treeDecorator - METHOD method_43191 (Lnet/minecraft/class_7389;)Lnet/minecraft/class_4651; - ARG 0 treeDecorator METHOD method_43192 (Lnet/minecraft/class_7389;)Ljava/lang/Integer; ARG 0 treeDecorator METHOD method_43193 (Lnet/minecraft/class_7389;)Ljava/lang/Integer; diff --git a/mappings/net/minecraft/world/gen/treedecorator/BeehiveTreeDecorator.mapping b/mappings/net/minecraft/world/gen/treedecorator/BeehiveTreeDecorator.mapping index 8de6343bab..e01e8e6fb1 100644 --- a/mappings/net/minecraft/world/gen/treedecorator/BeehiveTreeDecorator.mapping +++ b/mappings/net/minecraft/world/gen/treedecorator/BeehiveTreeDecorator.mapping @@ -3,12 +3,10 @@ CLASS net/minecraft/class_4659 net/minecraft/world/gen/treedecorator/BeehiveTree FIELD field_24958 CODEC Lcom/mojang/serialization/Codec; FIELD field_36346 BEE_NEST_FACE Lnet/minecraft/class_2350; FIELD field_36347 GENERATE_DIRECTIONS [Lnet/minecraft/class_2350; - METHOD (F)V + METHOD (FZ)V ARG 1 probability METHOD method_23464 (ILnet/minecraft/class_2338;)Z ARG 1 pos - METHOD method_28890 (Lnet/minecraft/class_4659;)Ljava/lang/Float; - ARG 0 decorator METHOD method_35373 (Lnet/minecraft/class_5819;Lnet/minecraft/class_4482;)V ARG 1 blockEntity METHOD method_40032 (Lnet/minecraft/class_4662$class_7402;Lnet/minecraft/class_2338;)Z diff --git a/mappings/net/minecraft/world/gen/trunk/UpwardsBranchingTrunkPlacer.mapping b/mappings/net/minecraft/world/gen/trunk/UpwardsBranchingTrunkPlacer.mapping index 5df71d6e8f..4e3ed75e2d 100644 --- a/mappings/net/minecraft/world/gen/trunk/UpwardsBranchingTrunkPlacer.mapping +++ b/mappings/net/minecraft/world/gen/trunk/UpwardsBranchingTrunkPlacer.mapping @@ -4,7 +4,7 @@ CLASS net/minecraft/class_7390 net/minecraft/world/gen/trunk/UpwardsBranchingTru FIELD field_38795 placeBranchPerLogProbability F FIELD field_38796 extraBranchLength Lnet/minecraft/class_6017; FIELD field_38797 canGrowThrough Lnet/minecraft/class_6885; - METHOD (IIILnet/minecraft/class_6017;FLnet/minecraft/class_6017;Lnet/minecraft/class_6885;)V + METHOD (IIILnet/minecraft/class_6017;FLnet/minecraft/class_6017;Lnet/minecraft/class_6885;Z)V ARG 1 baseHeight ARG 2 firstRandomHeight ARG 3 secondRandomHeight @@ -18,7 +18,6 @@ CLASS net/minecraft/class_7390 net/minecraft/world/gen/trunk/UpwardsBranchingTru ARG 3 random ARG 4 height ARG 5 config - ARG 6 nodes ARG 7 pos ARG 8 yOffset ARG 9 direction diff --git a/mappings/net/minecraft/world/poi/PointOfInterestStorage.mapping b/mappings/net/minecraft/world/poi/PointOfInterestStorage.mapping index 1a7f5e53b4..0643f9c32e 100644 --- a/mappings/net/minecraft/world/poi/PointOfInterestStorage.mapping +++ b/mappings/net/minecraft/world/poi/PointOfInterestStorage.mapping @@ -102,7 +102,7 @@ CLASS net/minecraft/class_4153 net/minecraft/world/poi/PointOfInterestStorage ARG 2 pos ARG 3 radius ARG 4 occupationStatus - METHOD method_22439 preloadChunks (Lnet/minecraft/class_4538;Lnet/minecraft/class_2338;I)V + METHOD method_22439 preloadChunks (Lnet/minecraft/class_4538;Lnet/minecraft/class_2338;ILnet/minecraft/class_2806;)V COMMENT Preloads chunks in a square area with the given radius. Loads the chunks with {@code ChunkStatus.EMPTY}. ARG 1 world ARG 2 pos diff --git a/mappings/net/minecraft/world/poi/PointOfInterestTypes.mapping b/mappings/net/minecraft/world/poi/PointOfInterestTypes.mapping index 89cf5518d9..c843c021d7 100644 --- a/mappings/net/minecraft/world/poi/PointOfInterestTypes.mapping +++ b/mappings/net/minecraft/world/poi/PointOfInterestTypes.mapping @@ -2,8 +2,7 @@ CLASS net/minecraft/class_7477 net/minecraft/world/poi/PointOfInterestTypes FIELD field_39299 BED_HEADS Ljava/util/Set; FIELD field_39300 CAULDRONS Ljava/util/Set; FIELD field_39301 POI_STATES_TO_TYPE Ljava/util/Map; - METHOD method_43988 getStatesOfBlock (Lnet/minecraft/class_2248;)Ljava/util/Set; - ARG 0 block + METHOD method_43988 getStatesOfBlock ([Lnet/minecraft/class_2248;)Ljava/util/Set; METHOD method_43989 getTypeForState (Lnet/minecraft/class_2680;)Ljava/util/Optional; ARG 0 state METHOD method_43990 registerStates (Lnet/minecraft/class_6880;Ljava/util/Set;)V