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

1.18.2 pre1 stuff (#3023) 

* 1.18.2 pre1 stuff

* Remove RegistryItemArgumentType, separate PR

* Apply suggestions from code review

Co-authored-by: enbrain <69905075+enbrain@users.noreply.github.com>

Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
Co-authored-by: enbrain <69905075+enbrain@users.noreply.github.com>
This commit is contained in:
apple502j 2022-02-23 02:00:35 +09:00 committed by GitHub
parent 45c56b435b
commit 9965d9ca53
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
22 changed files with 112 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
mappings/net/minecraft/client/font/MultilineText.mapping
View File

@ -49,6 +49,16 @@ CLASS net/minecraft/class_5489 net/minecraft/client/font/MultilineText
METHOD method_35726 createFromTexts (Lnet/minecraft/class_327;Ljava/util/List;)Lnet/minecraft/class_5489;
ARG 0 renderer
ARG 1 texts
METHOD method_41154 fillBackground (Lnet/minecraft/class_4587;IIIII)V
ARG 1 matrices
ARG 2 centerX
ARG 3 centerY
ARG 4 lineHeight
ARG 5 padding
ARG 6 color
CLASS 2
METHOD method_41155 (Lnet/minecraft/class_5489$class_5490;)I
ARG 0 line
CLASS class_5490 Line
FIELD field_26531 text Lnet/minecraft/class_5481;
FIELD field_26532 width I

6
mappings/net/minecraft/client/gui/screen/PresetsScreen.mapping
View File

@ -26,8 +26,10 @@ CLASS net/minecraft/class_430 net/minecraft/client/gui/screen/PresetsScreen
ARG 0 presetName
ARG 1 icon
ARG 2 presetBiome
ARG 3 structureKeys
ARG 4 generateStronghold
ARG 5 generateFeatures
ARG 6 layers
METHOD method_29058 parsePresetLayersString (Ljava/lang/String;)Ljava/util/List;
COMMENT Parse a string like {@code "minecraft:bedrock,3*minecraft:dirt,minecraft:grass_block"}
COMMENT to a list of {@link FlatChunkGeneratorLayer}.
@ -43,6 +45,10 @@ CLASS net/minecraft/class_430 net/minecraft/client/gui/screen/PresetsScreen
ARG 3 generatorConfig
METHOD method_29062 getGeneratorConfigString (Lnet/minecraft/class_3232;)Ljava/lang/String;
ARG 0 config
METHOD method_31127 (Ljava/util/Set;ZZ[Lnet/minecraft/class_3229;Lnet/minecraft/class_5321;Lnet/minecraft/class_5455;)Lnet/minecraft/class_3232;
ARG 5 dynamicRegistryManager
METHOD method_41156 (Lnet/minecraft/class_2378;Lnet/minecraft/class_5321;)Ljava/util/stream/Stream;
ARG 1 structureKey
CLASS class_431 SuperflatPreset
FIELD field_25045 generatorConfigProvider Ljava/util/function/Function;
FIELD field_2527 icon Lnet/minecraft/class_1792;

9
mappings/net/minecraft/client/gui/screen/Realms32BitWarningScreen.mapping Normal file
View File

@ -0,0 +1,9 @@
CLASS net/minecraft/class_7064 net/minecraft/client/gui/screen/Realms32BitWarningScreen
FIELD field_37212 HEADER Lnet/minecraft/class_2561;
FIELD field_37213 MESSAGE Lnet/minecraft/class_2561;
FIELD field_37214 CHECK_MESSAGE Lnet/minecraft/class_2561;
FIELD field_37215 NARRATED_TEXT Lnet/minecraft/class_2561;
METHOD <init> (Lnet/minecraft/class_437;)V
ARG 1 parent
METHOD method_41161 (Lnet/minecraft/class_4185;)V
ARG 1 button

8
mappings/net/minecraft/client/gui/screen/TitleScreen.mapping
View File

@ -14,6 +14,9 @@ CLASS net/minecraft/class_442 net/minecraft/client/gui/screen/TitleScreen
FIELD field_2594 EDITION_TITLE_TEXTURE Lnet/minecraft/class_2960;
FIELD field_32271 COPYRIGHT Lnet/minecraft/class_2561;
FIELD field_32272 DEMO_WORLD_NAME Ljava/lang/String;
FIELD field_37209 deprecationNotice Lnet/minecraft/class_442$class_7063;
FIELD field_37210 realms Lnet/minecraft/class_4341;
FIELD field_37211 displayedRealms32BitWarning Z
METHOD <init> (Z)V
ARG 1 doBackgroundFade
METHOD method_18105 loadTexturesAsync (Lnet/minecraft/class_1060;Ljava/util/concurrent/Executor;)Ljava/util/concurrent/CompletableFuture;
@ -54,7 +57,12 @@ CLASS net/minecraft/class_442 net/minecraft/client/gui/screen/TitleScreen
ARG 2 x
ARG 3 y
METHOD method_31129 canReadDemoWorldData ()Z
METHOD method_41157 (Lnet/minecraft/class_4877;)Z
ARG 1 server
METHOD method_41158 tryShowRealms32BitWarning ()V
METHOD method_41159 fetchRealmsSubscribed ()Z
METHOD method_41198 (Lnet/minecraft/class_4185;)V
ARG 1 button
CLASS 1
FIELD field_33829 MULTIPLAYER_DISABLED_TEXT Lnet/minecraft/class_2561;
CLASS class_7063 DeprecationNotice

16
mappings/net/minecraft/client/gui/screen/WarningScreen.mapping Normal file
View File

@ -0,0 +1,16 @@
CLASS net/minecraft/class_7065 net/minecraft/client/gui/screen/WarningScreen
FIELD field_37216 parent Lnet/minecraft/class_437;
FIELD field_37217 checkbox Lnet/minecraft/class_4286;
FIELD field_37218 header Lnet/minecraft/class_2561;
FIELD field_37219 message Lnet/minecraft/class_2561;
FIELD field_37220 checkMessage Lnet/minecraft/class_2561;
FIELD field_37221 narratedText Lnet/minecraft/class_2561;
FIELD field_37222 messageText Lnet/minecraft/class_5489;
METHOD <init> (Lnet/minecraft/class_2561;Lnet/minecraft/class_2561;Lnet/minecraft/class_2561;Lnet/minecraft/class_2561;Lnet/minecraft/class_437;)V
ARG 1 header
ARG 2 message
ARG 3 checkMessage
ARG 4 narratedText
ARG 5 parent
METHOD method_41160 initButtons (I)V
ARG 1 yOffset

2
mappings/net/minecraft/client/gui/screen/multiplayer/MultiplayerWarningScreen.mapping
View File

@ -2,6 +2,6 @@ CLASS net/minecraft/class_4749 net/minecraft/client/gui/screen/multiplayer/Multi
FIELD field_21843 HEADER Lnet/minecraft/class_2561;
FIELD field_21844 MESSAGE Lnet/minecraft/class_2561;
FIELD field_21845 CHECK_MESSAGE Lnet/minecraft/class_2561;
FIELD field_21846 PROCEED_TEXT Lnet/minecraft/class_2561;
FIELD field_21846 NARRATED_TEXT Lnet/minecraft/class_2561;
METHOD <init> (Lnet/minecraft/class_437;)V
ARG 1 parent

1
mappings/net/minecraft/client/option/GameOptions.mapping
View File

@ -184,6 +184,7 @@ CLASS net/minecraft/class_315 net/minecraft/client/option/GameOptions
FIELD field_34959 simulationDistance I
FIELD field_35426 showAutosaveIndicator Z
FIELD field_35637 allowServerListing Z
FIELD field_37208 skipRealms32BitWarning Z
METHOD <init> (Lnet/minecraft/class_310;Ljava/io/File;)V
ARG 1 client
ARG 2 optionsFile

5
mappings/net/minecraft/command/argument/ArgumentTypes.mapping
View File

@ -34,6 +34,11 @@ CLASS net/minecraft/class_2316 net/minecraft/command/argument/ArgumentTypes
ARG 2 ignoredNodes
METHOD method_30926 (Ljava/util/Set;Ljava/util/Set;Lcom/mojang/brigadier/tree/CommandNode;)V
ARG 2 node
METHOD method_41181 upcast (Ljava/lang/Class;)Ljava/lang/Class;
ARG 0 clazz
CLASS class_2317 Entry
FIELD field_10925 id Lnet/minecraft/class_2960;
FIELD field_10926 serializer Lnet/minecraft/class_2314;
METHOD <init> (Lnet/minecraft/class_2314;Lnet/minecraft/class_2960;)V
ARG 1 serializer
ARG 2 id

2
mappings/net/minecraft/loot/function/ExplorationMapLootFunction.mapping
View File

@ -10,6 +10,7 @@ CLASS net/minecraft/class_111 net/minecraft/loot/function/ExplorationMapLootFunc
FIELD field_31850 MANSION Ljava/lang/String;
METHOD <init> ([Lnet/minecraft/class_5341;Lnet/minecraft/class_6862;Lnet/minecraft/class_20$class_21;BIZ)V
ARG 1 conditions
ARG 2 destination
ARG 3 decoration
ARG 4 zoom
ARG 5 searchRadius
@ -28,6 +29,7 @@ CLASS net/minecraft/class_111 net/minecraft/loot/function/ExplorationMapLootFunc
METHOD method_500 withZoom (B)Lnet/minecraft/class_111$class_112;
ARG 1 zoom
METHOD method_502 withDestination (Lnet/minecraft/class_6862;)Lnet/minecraft/class_111$class_112;
ARG 1 destination
METHOD method_503 withSkipExistingChunks (Z)Lnet/minecraft/class_111$class_112;
ARG 1 skipExistingChunks
CLASS class_113 Serializer

3
mappings/net/minecraft/predicate/entity/LocationPredicate.mapping
View File

@ -16,6 +16,7 @@ CLASS net/minecraft/class_2090 net/minecraft/predicate/entity/LocationPredicate
ARG 2 y
ARG 3 z
ARG 4 biome
ARG 5 feature
ARG 6 dimension
ARG 7 smokey
ARG 8 light
@ -26,6 +27,7 @@ CLASS net/minecraft/class_2090 net/minecraft/predicate/entity/LocationPredicate
METHOD method_9016 dimension (Lnet/minecraft/class_5321;)Lnet/minecraft/class_2090;
ARG 0 dimension
METHOD method_9017 feature (Lnet/minecraft/class_5321;)Lnet/minecraft/class_2090;
ARG 0 feature
METHOD method_9018 test (Lnet/minecraft/class_3218;DDD)Z
ARG 1 world
ARG 2 x
@ -59,6 +61,7 @@ CLASS net/minecraft/class_2090 net/minecraft/predicate/entity/LocationPredicate
METHOD method_35276 x (Lnet/minecraft/class_2096$class_2099;)Lnet/minecraft/class_2090$class_2091;
ARG 1 x
METHOD method_35277 feature (Lnet/minecraft/class_5321;)Lnet/minecraft/class_2090$class_2091;
ARG 1 feature
METHOD method_35278 y (Lnet/minecraft/class_2096$class_2099;)Lnet/minecraft/class_2090$class_2091;
ARG 1 y
METHOD method_35279 dimension (Lnet/minecraft/class_5321;)Lnet/minecraft/class_2090$class_2091;

1
mappings/net/minecraft/server/command/LocateBiomeCommand.mapping
View File

@ -10,5 +10,6 @@ CLASS net/minecraft/class_4799 net/minecraft/server/command/LocateBiomeCommand
ARG 0 source
METHOD method_24495 execute (Lnet/minecraft/class_2168;Lnet/minecraft/class_7066$class_7068;)I
ARG 0 source
ARG 1 biome
METHOD method_24496 (Ljava/lang/Object;)Lcom/mojang/brigadier/Message;
ARG 0 id

21
mappings/net/minecraft/server/command/LocateCommand.mapping
View File

@ -1,5 +1,6 @@
CLASS net/minecraft/class_3079 net/minecraft/server/command/LocateCommand
FIELD field_13666 FAILED_EXCEPTION Lcom/mojang/brigadier/exceptions/DynamicCommandExceptionType;
FIELD field_37038 INVALID_EXCEPTION Lcom/mojang/brigadier/exceptions/DynamicCommandExceptionType;
METHOD method_13439 getDistance (IIII)F
ARG 0 x1
ARG 1 y1
@ -13,6 +14,26 @@ CLASS net/minecraft/class_3079 net/minecraft/server/command/LocateCommand
ARG 0 source
METHOD method_13457 execute (Lnet/minecraft/class_2168;Lnet/minecraft/class_7066$class_7068;)I
ARG 0 source
ARG 1 structureFeature
METHOD method_24499 sendCoordinates (Lnet/minecraft/class_2168;Lnet/minecraft/class_7066$class_7068;Lnet/minecraft/class_2338;Lcom/mojang/datafixers/util/Pair;Ljava/lang/String;)I
ARG 0 source
ARG 1 structureFeature
ARG 2 currentPos
ARG 3 structurePosAndEntry
ARG 4 successMessage
METHOD method_39984 (Lcom/mojang/brigadier/context/CommandContext;)I
ARG 0 context
METHOD method_39985 (Ljava/lang/Object;)Lcom/mojang/brigadier/Message;
ARG 0 id
METHOD method_40998 (Lcom/mojang/datafixers/util/Pair;Lnet/minecraft/class_6862;)Ljava/lang/String;
ARG 1 key
METHOD method_41000 (Lnet/minecraft/class_6880;)Lnet/minecraft/class_6885$class_6886;
ARG 0 entry
METHOD method_41001 (Lnet/minecraft/class_2378;Lnet/minecraft/class_5321;)Ljava/util/Optional;
ARG 1 key
METHOD method_41002 (Ljava/lang/Object;)Lcom/mojang/brigadier/Message;
ARG 0 id
METHOD method_41003 (Lnet/minecraft/class_5321;)Ljava/lang/String;
ARG 0 key
METHOD method_41004 (Lnet/minecraft/class_5321;)Ljava/lang/String;
ARG 0 key

4
mappings/net/minecraft/server/dedicated/MinecraftDedicatedServer.mapping
View File

@ -20,6 +20,10 @@ CLASS net/minecraft/class_3176 net/minecraft/server/dedicated/MinecraftDedicated
METHOD method_13948 createGui ()V
METHOD method_13950 createResourcePackHash ()Ljava/lang/String;
METHOD method_13951 convertData ()Z
METHOD method_16710 (ILnet/minecraft/class_3806;)Lnet/minecraft/class_3806;
ARG 2 serverPropertiesHandler
METHOD method_16711 (ZLnet/minecraft/class_3806;)Lnet/minecraft/class_3806;
ARG 2 serverPropertiesHandler
METHOD method_16712 setUseWhitelist (Z)V
ARG 1 useWhitelist
METHOD method_36239 parseResourcePackPrompt (Lnet/minecraft/class_3807;)Lnet/minecraft/class_2561;

4
mappings/net/minecraft/server/dedicated/ServerPropertiesHandler.mapping
View File

@ -50,6 +50,7 @@ CLASS net/minecraft/class_3806 net/minecraft/server/dedicated/ServerPropertiesHa
FIELD field_33432 resourcePackPrompt Ljava/lang/String;
FIELD field_34883 simulationDistance I
FIELD field_35564 hideOnlinePlayers Z
FIELD field_37039 worldGenProperties Lnet/minecraft/class_3806$class_7044;
METHOD method_16714 load (Ljava/nio/file/Path;)Lnet/minecraft/class_3806;
ARG 0 path
METHOD method_16715 (Ljava/lang/Integer;)Ljava/lang/Integer;
@ -58,5 +59,8 @@ CLASS net/minecraft/class_3806 net/minecraft/server/dedicated/ServerPropertiesHa
ARG 0 percentage
METHOD method_37371 getGeneratorOptions (Lnet/minecraft/class_5455;)Lnet/minecraft/class_5285;
ARG 1 registryManager
METHOD method_41005 (Ljava/lang/String;)Ljava/lang/String;
ARG 0 type
METHOD method_41186 (Ljava/lang/String;)Lcom/google/gson/JsonObject;
ARG 0 generatorSettings
CLASS class_7044 WorldGenProperties

1
mappings/net/minecraft/server/dedicated/ServerPropertiesLoader.mapping
View File

@ -5,4 +5,5 @@ CLASS net/minecraft/class_3807 net/minecraft/server/dedicated/ServerPropertiesLo
ARG 1 path
METHOD method_16717 getPropertiesHandler ()Lnet/minecraft/class_3806;
METHOD method_16718 apply (Ljava/util/function/UnaryOperator;)Lnet/minecraft/class_3807;
ARG 1 applier
METHOD method_16719 store ()V

2
mappings/net/minecraft/server/world/ServerWorld.mapping
View File

@ -245,6 +245,7 @@ CLASS net/minecraft/class_3218 net/minecraft/server/world/ServerWorld
ARG 1 event
METHOD method_23660 wakeSleepingPlayers ()V
METHOD method_24500 locateBiome (Ljava/util/function/Predicate;Lnet/minecraft/class_2338;II)Lcom/mojang/datafixers/util/Pair;
ARG 1 biomeEntryPredicate
ARG 2 pos
ARG 3 radius
ARG 4 blockCheckInterval
@ -370,6 +371,7 @@ CLASS net/minecraft/class_3218 net/minecraft/server/world/ServerWorld
COMMENT @return the position of the structure, or {@code null} if no structure could be found within the given search radius
COMMENT
COMMENT @see ChunkGenerator#locateStructure
ARG 1 structureTag
ARG 2 pos
COMMENT the position to start the searching at
ARG 3 radius

4
mappings/net/minecraft/tag/TagKey.mapping
View File

@ -17,3 +17,7 @@ CLASS net/minecraft/class_6862 net/minecraft/tag/TagKey
ARG 1 id
METHOD method_40095 (Lnet/minecraft/class_5321;Lnet/minecraft/class_2960;)Lnet/minecraft/class_6862;
ARG 1 id
METHOD method_41007 isOf (Lnet/minecraft/class_5321;)Z
ARG 1 registryRef
METHOD method_41008 tryCast (Lnet/minecraft/class_5321;)Ljava/util/Optional;
ARG 1 registryRef

2
mappings/net/minecraft/util/registry/DynamicRegistryManager.mapping
View File

@ -44,6 +44,8 @@ CLASS net/minecraft/class_5455 net/minecraft/util/registry/DynamicRegistryManage
ARG 2 entryCodec
ARG 3 networkEntryCodec
METHOD method_31141 addEntriesToLoad (Lnet/minecraft/class_5506$class_5507;Lnet/minecraft/class_5455$class_5456;)V
ARG 0 entryLoader
ARG 1 info
METHOD method_33309 getManaged (Lnet/minecraft/class_5321;)Lnet/minecraft/class_2378;
COMMENT Retrieves a registry from this manager,
COMMENT or throws an exception when the registry does not exist.

6
mappings/net/minecraft/village/TradeOffers.mapping
View File

@ -35,10 +35,16 @@ CLASS net/minecraft/class_3853 net/minecraft/village/TradeOffers
FIELD field_18589 price I
FIELD field_18590 maxUses I
FIELD field_18591 experience I
FIELD field_37051 nameKey Ljava/lang/String;
FIELD field_7473 iconType Lnet/minecraft/class_20$class_21;
FIELD field_7474 structure Lnet/minecraft/class_6862;
METHOD <init> (ILnet/minecraft/class_6862;Ljava/lang/String;Lnet/minecraft/class_20$class_21;II)V
ARG 1 price
ARG 2 structure
ARG 3 nameKey
ARG 4 iconType
ARG 5 maxUses
ARG 6 experience
CLASS class_4160 SellDyedArmorFactory
FIELD field_18544 sell Lnet/minecraft/class_1792;
FIELD field_18545 price I

4
mappings/net/minecraft/world/FeatureUpdater.mapping
View File

@ -17,9 +17,13 @@ CLASS net/minecraft/class_3360 net/minecraft/world/FeatureUpdater
ARG 1 chunkX
ARG 2 chunkZ
ARG 3 id
METHOD method_14739 (Ljava/util/HashMap;)V
ARG 0 map
METHOD method_14741 getUpdatedStarts (Lnet/minecraft/class_2487;Lnet/minecraft/class_1923;)Lnet/minecraft/class_2487;
ARG 1 nbt
ARG 2 pos
METHOD method_14742 (Ljava/util/HashMap;)V
ARG 0 map
METHOD method_14744 markResolved (J)V
METHOD method_14745 create (Lnet/minecraft/class_5321;Lnet/minecraft/class_26;)Lnet/minecraft/class_3360;
ARG 0 world

1
mappings/net/minecraft/world/chunk/Chunk.mapping
View File

@ -16,6 +16,7 @@ CLASS net/minecraft/class_2791 net/minecraft/world/chunk/Chunk
FIELD field_34552 structureStarts Ljava/util/Map;
FIELD field_34553 structureReferences Ljava/util/Map;
FIELD field_35468 blendingData Lnet/minecraft/class_6749;
FIELD field_37052 EMPTY_STRUCTURE_REFERENCES Lit/unimi/dsi/fastutil/longs/LongSet;
METHOD <init> (Lnet/minecraft/class_1923;Lnet/minecraft/class_2843;Lnet/minecraft/class_5539;Lnet/minecraft/class_2378;J[Lnet/minecraft/class_2826;Lnet/minecraft/class_6749;)V
ARG 1 pos
ARG 2 upgradeData

1
mappings/net/minecraft/world/gen/GeneratorOptions.mapping
View File

@ -21,6 +21,7 @@ CLASS net/minecraft/class_5285 net/minecraft/world/gen/GeneratorOptions
ARG 0 registryManager
METHOD method_28021 fromProperties (Lnet/minecraft/class_5455;Lnet/minecraft/class_3806$class_7044;)Lnet/minecraft/class_5285;
ARG 0 registryManager
ARG 1 worldGenProperties
METHOD method_28024 withHardcore (ZLjava/util/OptionalLong;)Lnet/minecraft/class_5285;
ARG 1 hardcore
ARG 2 seed