mirrors/yarn
mirrors
/
yarn
mirror of https://github.com/FabricMC/yarn.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge Shnupbups' PR

This commit is contained in:
apple502j 2024-03-16 21:18:48 +09:00
parent d3e21e24d2
commit f4037145d5
No known key found for this signature in database
GPG Key ID: 2A69798565A099A9
28 changed files with 68 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
mappings/net/minecraft/block/entity/BannerPatterns.mapping
View File

@ -1,5 +1,5 @@
CLASS net/minecraft/class_7446 net/minecraft/block/entity/BannerPatterns
METHOD method_43721 registerAndGetDefault (Lnet/minecraft/class_7891;)V
METHOD method_43721 bootstrap (Lnet/minecraft/class_7891;)V
ARG 0 registry
METHOD method_43722 of (Ljava/lang/String;)Lnet/minecraft/class_5321;
ARG 0 id

2
mappings/net/minecraft/client/gl/PostEffectPass.mapping
View File

@ -13,7 +13,7 @@ CLASS net/minecraft/class_283 net/minecraft/client/gl/PostEffectPass
ARG 2 programName
ARG 3 input
ARG 4 output
ARG 5 useLinearFilter
ARG 5 linear
METHOD method_1291 setProjectionMatrix (Lorg/joml/Matrix4f;)V
ARG 1 projectionMatrix
METHOD method_1292 addAuxTarget (Ljava/lang/String;Ljava/util/function/IntSupplier;II)V

2
mappings/net/minecraft/client/gl/PostEffectProcessor.mapping
View File

@ -36,7 +36,7 @@ CLASS net/minecraft/class_279 net/minecraft/client/gl/PostEffectProcessor
ARG 1 programName
ARG 2 source
ARG 3 dest
ARG 4 useLinearFilter
ARG 4 linear
METHOD method_1263 parseUniform (Lcom/google/gson/JsonElement;)V
ARG 1 jsonUniform
METHOD method_1264 getSecondaryTarget (Ljava/lang/String;)Lnet/minecraft/class_276;

4
mappings/net/minecraft/client/gui/screen/option/LanguageOptionsScreen.mapping
View File

@ -7,6 +7,10 @@ CLASS net/minecraft/class_426 net/minecraft/client/gui/screen/option/LanguageOpt
ARG 2 options
ARG 3 languageManager
METHOD method_52184 onDone ()V
METHOD method_57729 (Lnet/minecraft/class_4185;)V
ARG 1 button
METHOD method_57730 (Lnet/minecraft/class_4185;)V
ARG 1 button
CLASS class_4195 LanguageSelectionListWidget
METHOD <init> (Lnet/minecraft/class_426;Lnet/minecraft/class_310;)V
ARG 2 client

2
mappings/net/minecraft/client/gui/screen/option/TelemetryInfoScreen.mapping
View File

@ -30,3 +30,5 @@ CLASS net/minecraft/class_7944 net/minecraft/client/gui/screen/option/TelemetryI
METHOD method_54803 updateOptIn (Lnet/minecraft/class_339;Z)V
ARG 1 checkbox
ARG 2 checked
METHOD method_57768 (Lnet/minecraft/class_4185;)V
ARG 1 button

28
mappings/net/minecraft/client/gui/widget/OptionListWidget.mapping
View File

@ -6,9 +6,9 @@ CLASS net/minecraft/class_353 net/minecraft/client/gui/widget/OptionListWidget
ARG 4 optionsScreen
METHOD method_20406 addSingleOptionEntry (Lnet/minecraft/class_7172;)V
ARG 1 option
METHOD method_20407 addOptionEntries (Lnet/minecraft/class_339;Lnet/minecraft/class_339;)V
ARG 1 left
ARG 2 right
METHOD method_20407 addWidgetEntry (Lnet/minecraft/class_339;Lnet/minecraft/class_339;)V
ARG 1 firstWidget
ARG 2 secondWidget
METHOD method_20408 addAll ([Lnet/minecraft/class_7172;)V
ARG 1 options
METHOD method_29624 getHoveredWidget (DD)Ljava/util/Optional;
@ -20,27 +20,27 @@ CLASS net/minecraft/class_353 net/minecraft/client/gui/widget/OptionListWidget
ARG 1 widgets
CLASS class_354 WidgetEntry
FIELD field_18214 widgets Ljava/util/List;
FIELD field_49484 MARGIN_X I
FIELD field_49485 optionsScreen Lnet/minecraft/class_437;
FIELD field_49484 WIDGET_X_SPACING I
FIELD field_49485 screen Lnet/minecraft/class_437;
METHOD <init> (Ljava/util/List;Lnet/minecraft/class_437;)V
ARG 1 widgets
ARG 2 optionsScreen
ARG 2 screen
METHOD method_20409 create (Ljava/util/List;Lnet/minecraft/class_437;)Lnet/minecraft/class_353$class_354;
ARG 0 widgets
ARG 1 optionsScreen
ARG 1 screen
METHOD method_20410 create (Lnet/minecraft/class_339;Lnet/minecraft/class_339;Lnet/minecraft/class_437;)Lnet/minecraft/class_353$class_354;
ARG 0 left
ARG 1 right
ARG 2 optionsScreen
CLASS class_9379 OptionEntry
ARG 0 firstWidget
ARG 1 secondWidget
ARG 2 screen
CLASS class_9379 OptionWidgetEntry
FIELD field_49893 optionWidgets Ljava/util/Map;
METHOD <init> (Ljava/util/Map;Lnet/minecraft/class_4667;)V
ARG 1 optionWidgets
ARG 1 widgets
ARG 2 optionsScreen
METHOD method_58228 create (Lnet/minecraft/class_315;Lnet/minecraft/class_7172;Lnet/minecraft/class_7172;Lnet/minecraft/class_4667;)Lnet/minecraft/class_353$class_9379;
ARG 0 gameOptions
ARG 1 left
ARG 2 right
ARG 1 firstOption
ARG 2 secondOption
ARG 3 optionsScreen
METHOD method_58229 create (Lnet/minecraft/class_315;Lnet/minecraft/class_7172;Lnet/minecraft/class_4667;)Lnet/minecraft/class_353$class_9379;
ARG 0 gameOptions

11
mappings/net/minecraft/client/particle/FireworksSparkParticle.mapping
View File

@ -31,6 +31,8 @@ CLASS net/minecraft/class_677 net/minecraft/client/particle/FireworksSparkPartic
FIELD field_3806 explosions Ljava/util/List;
FIELD field_3807 flicker Z
FIELD field_3808 age I
FIELD field_49565 CREEPER_PATTERN [[D
FIELD field_49566 STAR_PATTERN [[D
METHOD <init> (Lnet/minecraft/class_638;DDDDDDLnet/minecraft/class_702;Ljava/util/List;)V
ARG 1 world
ARG 2 x
@ -40,9 +42,12 @@ CLASS net/minecraft/class_677 net/minecraft/client/particle/FireworksSparkPartic
ARG 10 velocityY
ARG 12 velocityZ
ARG 14 particleManager
ARG 15 fireworkExplosions
METHOD method_3028 explodeStar (D[[DLit/unimi/dsi/fastutil/ints/IntList;Lit/unimi/dsi/fastutil/ints/IntList;ZZZ)V
ARG 1 size
ARG 3 pattern
ARG 4 colors
ARG 5 targetColors
ARG 6 trail
ARG 7 flicker
ARG 8 keepShape
@ -54,13 +59,19 @@ CLASS net/minecraft/class_677 net/minecraft/client/particle/FireworksSparkPartic
ARG 7 velocityX
ARG 9 velocityY
ARG 11 velocityZ
ARG 13 colors
ARG 14 targetColors
ARG 15 trail
ARG 16 flicker
METHOD method_3031 explodeBall (DILit/unimi/dsi/fastutil/ints/IntList;Lit/unimi/dsi/fastutil/ints/IntList;ZZ)V
ARG 1 size
ARG 3 amount
ARG 4 colors
ARG 5 targetColors
ARG 6 trail
ARG 7 flicker
METHOD method_3032 explodeBurst (Lit/unimi/dsi/fastutil/ints/IntList;Lit/unimi/dsi/fastutil/ints/IntList;ZZ)V
ARG 1 colors
ARG 2 targetColors
ARG 3 trail
ARG 4 flicker

2
mappings/net/minecraft/client/render/GameRenderer.mapping
View File

@ -394,6 +394,8 @@ CLASS net/minecraft/class_757 net/minecraft/client/render/GameRenderer
ARG 0 hitResult
ARG 1 cameraPos
ARG 2 interactionRange
METHOD method_56845 (Lnet/minecraft/class_5944;)V
ARG 0 program
METHOD method_56846 getRenderTypeCloudsProgram ()Lnet/minecraft/class_5944;
METHOD method_57796 renderBlur (F)V
ARG 1 delta

2
mappings/net/minecraft/component/type/BookContentComponent.mapping → mappings/net/minecraft/component/type/BookContent.mapping
View File

@ -1,3 +1,3 @@
CLASS net/minecraft/class_9364 net/minecraft/component/type/BookContentComponent
CLASS net/minecraft/class_9364 net/minecraft/component/type/BookContent
METHOD method_58186 withPages (Ljava/util/List;)Ljava/lang/Object;
ARG 1 pages

4
mappings/net/minecraft/component/type/WritableBookContentComponent.mapping
View File

@ -5,6 +5,10 @@ CLASS net/minecraft/class_9301 net/minecraft/component/type/WritableBookContentC
FIELD field_49372 PACKET_CODEC Lnet/minecraft/class_9139;
FIELD field_49373 PAGE_CODEC Lcom/mojang/serialization/Codec;
FIELD field_49374 PAGES_CODEC Lcom/mojang/serialization/Codec;
METHOD <init> (Ljava/util/List;)V
ARG 1 pages
METHOD equals (Ljava/lang/Object;)Z
ARG 1 o
METHOD method_57516 (Lcom/mojang/serialization/codecs/RecordCodecBuilder$Instance;)Lcom/mojang/datafixers/kinds/App;
ARG 0 instance
METHOD method_57517 stream (Z)Ljava/util/stream/Stream;

1
mappings/net/minecraft/component/type/WrittenBookContentComponent.mapping
View File

@ -1,5 +1,4 @@
CLASS net/minecraft/class_9302 net/minecraft/component/type/WrittenBookContentComponent
FIELD comp_2422 comp_2418 Ljava/util/List;
FIELD field_49375 MAX_SERIALIZED_PAGE_LENGTH I
FIELD field_49376 MAX_PAGE_COUNT I
FIELD field_49378 MAX_TITLE_LENGTH I

2
mappings/net/minecraft/data/server/recipe/OneTwentyOneRecipeProvider.mapping
View File

@ -3,4 +3,4 @@ CLASS net/minecraft/class_8904 net/minecraft/data/server/recipe/OneTwentyOneReci
ARG 0 item
METHOD method_58268 (Lnet/minecraft/class_8790;Lnet/minecraft/class_7803$class_8905;)V
ARG 1 template
METHOD method_58269 getSmithingTemplates ()Ljava/util/stream/Stream;
METHOD method_58269 streamSmithingTemplates ()Ljava/util/stream/Stream;

2
mappings/net/minecraft/data/server/recipe/VanillaRecipeProvider.mapping
View File

@ -9,7 +9,7 @@ CLASS net/minecraft/class_7803 net/minecraft/data/server/recipe/VanillaRecipePro
FIELD field_40659 EMERALD_ORES Lcom/google/common/collect/ImmutableList;
METHOD method_51693 (Lnet/minecraft/class_1792;)Lnet/minecraft/class_7803$class_8905;
ARG 0 template
METHOD method_51694 getTrimSmithingTemplateMap ()Ljava/util/stream/Stream;
METHOD method_51694 streamSmithingTemplates ()Ljava/util/stream/Stream;
METHOD method_51695 (Lnet/minecraft/class_8790;Lnet/minecraft/class_7803$class_8905;)V
ARG 1 template
CLASS class_8905 SmithingTemplate

2
mappings/net/minecraft/entity/LivingEntity.mapping
View File

@ -26,7 +26,7 @@ CLASS net/minecraft/class_1309 net/minecraft/entity/LivingEntity
FIELD field_45740 ACTIVE_EFFECTS_NBT_KEY Ljava/lang/String;
FIELD field_47757 prevScale F
FIELD field_48826 syncedBodyArmorStack Lnet/minecraft/class_1799;
FIELD field_49792 POTION_SWIRLS_PARTICLES Lnet/minecraft/class_2940;
FIELD field_49792 POTION_SWIRLS Lnet/minecraft/class_2940;
FIELD field_6210 bodyTrackingIncrements I
FIELD field_6212 sidewaysSpeed F
FIELD field_6213 deathTime I

2
mappings/net/minecraft/entity/data/TrackedDataHandlerRegistry.mapping
View File

@ -32,7 +32,7 @@ CLASS net/minecraft/class_2943 net/minecraft/entity/data/TrackedDataHandlerRegis
FIELD field_48265 OPTIONAL_BLOCK_STATE_CODEC Lnet/minecraft/class_9139;
FIELD field_48266 OPTIONAL_INT_CODEC Lnet/minecraft/class_9139;
FIELD field_49713 WOLF_VARIANT Lnet/minecraft/class_2941;
FIELD field_49774 PARTICLES Lnet/minecraft/class_2941;
FIELD field_49774 PARTICLE_LIST Lnet/minecraft/class_2941;
METHOD method_12719 getId (Lnet/minecraft/class_2941;)I
ARG 0 handler
METHOD method_12720 register (Lnet/minecraft/class_2941;)V

2
mappings/net/minecraft/entity/effect/StatusEffect.mapping
View File

@ -1,7 +1,7 @@
CLASS net/minecraft/class_1291 net/minecraft/entity/effect/StatusEffect
FIELD field_18270 category Lnet/minecraft/class_4081;
FIELD field_47738 fadeTicks I
FIELD field_49789 DEFAULT_ALPHA I
FIELD field_49789 AMBIENT_PARTICLE_ALPHA I
FIELD field_49790 particleFactory Ljava/util/function/Function;
FIELD field_5883 translationKey Ljava/lang/String;
FIELD field_5885 attributeModifiers Ljava/util/Map;

1
mappings/net/minecraft/entity/mob/MobEntity.mapping
View File

@ -158,6 +158,7 @@ CLASS net/minecraft/class_1308 net/minecraft/entity/mob/MobEntity
ARG 1 stack
METHOD method_57296 hasComponentsOtherThanDamage (Lnet/minecraft/class_1799;)Z
ARG 0 stack
METHOD method_58151 mightBeLeashed ()Z
METHOD method_5929 getDropChance (Lnet/minecraft/class_1304;)F
ARG 1 slot
METHOD method_5930 setForwardSpeed (F)V

6
mappings/net/minecraft/entity/mob/RavagerEntity.mapping
View File

@ -1,7 +1,7 @@
CLASS net/minecraft/class_1584 net/minecraft/entity/mob/RavagerEntity
FIELD field_30483 STUNNED_PARTICLE_Z_VELOCITY F
FIELD field_30484 STUNNED_PARTICLE_Y_VELOCITY F
FIELD field_30485 STUNNED_PARTICLE_X_VELOCITY F
FIELD field_30483 STUNNED_PARTICLE_BLUE F
FIELD field_30484 STUNNED_PARTICLE_GREEN F
FIELD field_30485 STUNNED_PARTICLE_RED F
FIELD field_7301 IS_NOT_RAVAGER Ljava/util/function/Predicate;
FIELD field_7302 stunTick I
FIELD field_7303 attackTick I

1
mappings/net/minecraft/item/Items.mapping
View File

@ -419,6 +419,7 @@ CLASS net/minecraft/class_1802 net/minecraft/item/Items
FIELD field_47026 CHISELED_TUFF_BRICKS Lnet/minecraft/class_1792;
FIELD field_47314 TRIAL_SPAWNER Lnet/minecraft/class_1792;
FIELD field_48847 VAULT Lnet/minecraft/class_1792;
FIELD field_49813 HEAVY_CORE Lnet/minecraft/class_1792;
FIELD field_8043 ORANGE_TERRACOTTA Lnet/minecraft/class_1792;
FIELD field_8047 JUNGLE_PRESSURE_PLATE Lnet/minecraft/class_1792;
FIELD field_8048 SPRUCE_BUTTON Lnet/minecraft/class_1792;

3
mappings/net/minecraft/item/MaceItem.mapping
View File

@ -1,2 +1,5 @@
CLASS net/minecraft/class_9362 net/minecraft/item/MaceItem
FIELD field_49823 MINING_SPEED_MULTIPLIER F
FIELD field_49824 ATTACK_DAMAGE_MODIFIER_VALUE I
FIELD field_49825 ATTACK_SPEED_MODIFIER_VALUE F
FIELD field_49826 ATTRIBUTE_MODIFIERS Lcom/google/common/collect/ImmutableMultimap;

2
mappings/net/minecraft/particle/EntityEffectParticleEffect.mapping
View File

@ -8,7 +8,7 @@ CLASS net/minecraft/class_9381 net/minecraft/particle/EntityEffectParticleEffect
METHOD method_58252 toInt (F)I
ARG 0 value
METHOD method_58253 (Lnet/minecraft/class_9381;)Ljava/lang/Integer;
ARG 0 effect
ARG 0 particleEffect
METHOD method_58254 createCodec (Lnet/minecraft/class_2396;)Lcom/mojang/serialization/Codec;
ARG 0 type
METHOD method_58255 create (Lnet/minecraft/class_2396;FFF)Lnet/minecraft/class_9381;

4
mappings/net/minecraft/predicate/item/ItemPredicate.mapping
View File

@ -15,9 +15,9 @@ CLASS net/minecraft/class_2073 net/minecraft/predicate/item/ItemPredicate
ARG 0 item
METHOD method_57299 component (Lnet/minecraft/class_9329;)Lnet/minecraft/class_2073$class_2074;
ARG 1 componentPredicate
METHOD method_58179 add (Lnet/minecraft/class_9360$class_8745;Lnet/minecraft/class_9360;)Lnet/minecraft/class_2073$class_2074;
METHOD method_58179 subPredicate (Lnet/minecraft/class_9360$class_8745;Lnet/minecraft/class_9360;)Lnet/minecraft/class_2073$class_2074;
ARG 1 type
ARG 2 predicate
ARG 2 subPredicate
METHOD method_8973 create ()Lnet/minecraft/class_2073$class_2074;
METHOD method_8975 tag (Lnet/minecraft/class_6862;)Lnet/minecraft/class_2073$class_2074;
ARG 1 tag

2
mappings/net/minecraft/server/network/ServerPlayerEntity.mapping
View File

@ -265,7 +265,7 @@ CLASS net/minecraft/class_3222 net/minecraft/server/network/ServerPlayerEntity
METHOD method_54934 (Lnet/minecraft/class_2960;)Ljava/util/stream/Stream;
ARG 1 recipe
METHOD method_55633 updateCreativeInteractionRangeModifiers ()V
METHOD method_58143 setShouldSpawnExtraParticlesOnFall (Z)V
METHOD method_58143 setSpawnExtraParticlesOnFall (Z)V
ARG 1 spawnExtraParticlesOnFall
METHOD method_7336 changeGameMode (Lnet/minecraft/class_1934;)Z
ARG 1 gameMode

2
mappings/net/minecraft/server/network/ServerPlayerInteractionManager.mapping
View File

@ -56,7 +56,7 @@ CLASS net/minecraft/class_3225 net/minecraft/server/network/ServerPlayerInteract
COMMENT @return whether the current game mode has been changed
ARG 1 gameMode
METHOD method_30119 getPreviousGameMode ()Lnet/minecraft/class_1934;
METHOD method_41250 (Lnet/minecraft/class_2338;ZILjava/lang/String;)V
METHOD method_41250 onBlockBreakingAction (Lnet/minecraft/class_2338;ZILjava/lang/String;)V
ARG 1 pos
ARG 2 success
ARG 3 sequence

2
mappings/net/minecraft/util/Colors.mapping
View File

@ -18,4 +18,4 @@ CLASS net/minecraft/class_8012 net/minecraft/util/Colors
COMMENT Represents the color light yellow, {@code 0xFFFFFF55}.
FIELD field_49788 ALTERNATE_WHITE I
COMMENT Represents a variant of the color white, used so that the two alternate with
COMMENT each other, {@code 0xFFBABAB9}.
COMMENT each other, {@code 0xFFBABABA}.

2
mappings/net/minecraft/util/math/Direction.mapping
View File

@ -112,7 +112,7 @@ CLASS net/minecraft/class_2350 net/minecraft/util/math/Direction
ARG 1 y
ARG 2 z
METHOD method_58251 getFacing (Lnet/minecraft/class_243;)Lnet/minecraft/class_2350;
ARG 0 pos
ARG 0 vec
CLASS class_2351 Axis
FIELD field_11053 name Ljava/lang/String;
FIELD field_23780 VALUES [Lnet/minecraft/class_2350$class_2351;

1
unpick-definitions/colors.unpick
View File

@ -4,6 +4,7 @@ constant argb_color net/minecraft/util/Colors WHITE
constant argb_color net/minecraft/util/Colors BLACK
constant argb_color net/minecraft/util/Colors GRAY
constant argb_color net/minecraft/util/Colors LIGHT_GRAY
constant argb_color net/minecraft/util/Colors ALTERNATE_WHITE
constant argb_color net/minecraft/util/Colors RED
constant argb_color net/minecraft/util/Colors LIGHT_RED
constant argb_color net/minecraft/util/Colors YELLOW

6
unpick-definitions/gl.unpick
View File

@ -215,6 +215,8 @@ target_method com/mojang/blaze3d/platform/GlStateManager _glBlitFrameBuffer (III
param 9 gl_filter
target_method net/minecraft/client/gl/Framebuffer setTexFilter (I)V
param 0 gl_filter
target_method net/minecraft/client/gl/Framebuffer setTexFilter (IZ)V
param 0 gl_filter
target_method com/mojang/blaze3d/platform/GlStateManager _texParameter (III)V
param 0 gl_tex_target
@ -369,3 +371,7 @@ target_method org/lwjgl/opengl/GL11 glPixelStorei (II)V
target_method com/mojang/blaze3d/systems/RenderSystem clear (IZ)V
param 0 gl_clear_mask
target_method net/minecraft/client/gl/PostEffectPass getTexFilter ()V
return gl_filter
target_method net/minecraft/client/gl/PostEffectProcessor setTexFilter (I)V
param 0 gl_filter