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

Map realms (#2347) 

* Map realms

* Update mappings/net/minecraft/client/realms/dto/UploadInfo.mapping

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

* Update mappings/net/minecraft/client/realms/task/ResettingWorldTask.mapping

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

Co-authored-by: enbrain <69905075+enbrain@users.noreply.github.com>
This commit is contained in:
apple502j 2021-04-26 20:22:34 +09:00 committed by GitHub
parent 3d5a2db229
commit 1597971e90
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
23 changed files with 137 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
mappings/net/minecraft/client/realms/FileUpload.mapping
View File

@ -11,6 +11,8 @@ CLASS net/minecraft/class_4337 net/minecraft/client/realms/FileUpload
FIELD field_19559 cancelled Ljava/util/concurrent/atomic/AtomicBoolean;
FIELD field_19560 uploadTask Ljava/util/concurrent/CompletableFuture;
FIELD field_19561 requestConfig Lorg/apache/http/client/config/RequestConfig;
FIELD field_32056 MAX_ATTEMPTS I
FIELD field_32057 UPLOAD_ENDPOINT Ljava/lang/String;
METHOD <init> (Ljava/io/File;JILnet/minecraft/class_4888;Lnet/minecraft/class_320;Ljava/lang/String;Lnet/minecraft/class_4351;)V
ARG 1 file
ARG 2 worldId

2
mappings/net/minecraft/client/realms/KeyCombo.mapping
View File

@ -2,6 +2,8 @@ CLASS net/minecraft/class_4324 net/minecraft/client/realms/KeyCombo
FIELD field_19453 chars [C
FIELD field_19454 matchIndex I
FIELD field_19455 onCompletion Ljava/lang/Runnable;
METHOD <init> ([C)V
ARG 1 keys
METHOD <init> ([CLjava/lang/Runnable;)V
ARG 1 keys
ARG 2 task

41
mappings/net/minecraft/client/realms/RealmsClient.mapping
View File

@ -6,6 +6,44 @@ CLASS net/minecraft/class_4341 net/minecraft/client/realms/RealmsClient
FIELD field_19580 username Ljava/lang/String;
FIELD field_22568 JSON Lnet/minecraft/class_4869;
FIELD field_26901 client Lnet/minecraft/class_310;
FIELD field_32058 COUNT_PENDING_ENDPOINT Ljava/lang/String;
FIELD field_32059 PENDING_ENDPOINT Ljava/lang/String;
FIELD field_32060 ACCEPT_INVITATION_ENDPOINT Ljava/lang/String;
FIELD field_32061 REJECT_INVITATION_ENDPOINT Ljava/lang/String;
FIELD field_32062 WORLD_ENDPOINT_4 Ljava/lang/String;
FIELD field_32063 WORLD_ENDPOINT_5 Ljava/lang/String;
FIELD field_32064 WORLD_SLOT_ENDPOINT Ljava/lang/String;
FIELD field_32065 WORLD_OPEN_ENDPOINT Ljava/lang/String;
FIELD field_32066 WORLD_CLOSE_ENDPOINT Ljava/lang/String;
FIELD field_32067 WORLD_RESET_ENDPOINT Ljava/lang/String;
FIELD field_32068 WORLD_ENDPOINT_6 Ljava/lang/String;
FIELD field_32069 WORLD_BACKUPS_ENDPOINT Ljava/lang/String;
FIELD field_32070 WORLD_SLOT_DOWNLOAD_ENDPOINT Ljava/lang/String;
FIELD field_32071 WORLD_BACKUPS_UPLOAD_ENDPOINT Ljava/lang/String;
FIELD field_32072 CLIENT_COMPATIBLE_ENDPOINT Ljava/lang/String;
FIELD field_32073 TOS_AGREED_ENDPOINT Ljava/lang/String;
FIELD field_32074 NEWS_ENDPOINT Ljava/lang/String;
FIELD field_32075 STAGE_AVAILABLE_ENDPOINT Ljava/lang/String;
FIELD field_32076 WORLDS_ENDPOINT Ljava/lang/String;
FIELD field_32077 INVITES_ENDPOINT Ljava/lang/String;
FIELD field_32078 MCO_ENDPOINT Ljava/lang/String;
FIELD field_32079 SUBSCRIPTIONS_ENDPOINT Ljava/lang/String;
FIELD field_32080 ACTIVITIES_ENDPOINT Ljava/lang/String;
FIELD field_32081 OPS_ENDPOINT Ljava/lang/String;
FIELD field_32082 PING_STAT_ENDPOINT Ljava/lang/String;
FIELD field_32083 TRIAL_ENDPOINT Ljava/lang/String;
FIELD field_32084 WORLD_INITIALIZE_ENDPOINT Ljava/lang/String;
FIELD field_32085 WORLD_ENDPOINT Ljava/lang/String;
FIELD field_32086 LIVEPLAYERLIST_ENDPOINT Ljava/lang/String;
FIELD field_32087 WORLD_ENDPOINT_2 Ljava/lang/String;
FIELD field_32088 WORLD_PROFILE_ENDPOINT Ljava/lang/String;
FIELD field_32089 MINIGAMES_ENDPOINT Ljava/lang/String;
FIELD field_32090 AVAILABLE_ENDPOINT Ljava/lang/String;
FIELD field_32091 TEMPLATES_ENDPOINT Ljava/lang/String;
FIELD field_32092 JOIN_PC_ENDPOINT Ljava/lang/String;
FIELD field_32093 ID_ENDPOINT Ljava/lang/String;
FIELD field_32094 WORLD_ENDPOINT_3 Ljava/lang/String;
FIELD field_32095 INVITE_ENDPOINT Ljava/lang/String;
METHOD <init> (Ljava/lang/String;Ljava/lang/String;Lnet/minecraft/class_310;)V
ARG 1 sessionId
ARG 2 username
@ -29,6 +67,7 @@ CLASS net/minecraft/class_4341 net/minecraft/client/realms/RealmsClient
ARG 3 profileUuid
METHOD method_20995 resetWorldWithSeed (JLnet/minecraft/class_4413;)Ljava/lang/Boolean;
ARG 1 worldId
ARG 3 resetWorldInfo
METHOD method_20996 initializeWorld (JLjava/lang/String;Ljava/lang/String;)V
ARG 1 worldId
ARG 3 name
@ -103,6 +142,8 @@ CLASS net/minecraft/class_4341 net/minecraft/client/realms/RealmsClient
METHOD method_21033 trialAvailable ()Ljava/lang/Boolean;
METHOD method_31381 isOwnerBlocked (Lnet/minecraft/class_4871;)Z
ARG 1 pendingInvite
METHOD method_35684 getPlayerActivities (J)Lnet/minecraft/class_6193;
ARG 1 worldId
CLASS class_4342 CompatibleVersionResponse
FIELD field_19582 COMPATIBLE Lnet/minecraft/class_4341$class_4342;
FIELD field_19583 OUTDATED Lnet/minecraft/class_4341$class_4342;

6
mappings/net/minecraft/client/realms/RealmsConnection.mapping
View File

@ -7,4 +7,10 @@ CLASS net/minecraft/class_4902 net/minecraft/client/realms/RealmsConnection
ARG 1 onlineScreen
METHOD method_25477 abort ()V
METHOD method_25480 connect (Lnet/minecraft/class_4877;Ljava/lang/String;I)V
ARG 1 server
ARG 2 host
ARG 3 port
METHOD method_25481 tick ()V
CLASS 1
METHOD method_10210 (Lnet/minecraft/class_2561;)V
ARG 0 status

1
mappings/net/minecraft/client/realms/RealmsServerAddress.mapping
View File

@ -6,4 +6,5 @@ CLASS net/minecraft/class_4906 net/minecraft/client/realms/RealmsServerAddress
ARG 2 port
METHOD method_25496 getHost ()Ljava/lang/String;
METHOD method_25497 parseString (Ljava/lang/String;)Lnet/minecraft/class_4906;
ARG 0 address
METHOD method_25498 getPort ()I

2
mappings/net/minecraft/client/realms/RepeatedNarrator.mapping
View File

@ -5,6 +5,8 @@ CLASS net/minecraft/class_4907 net/minecraft/client/realms/RepeatedNarrator
ARG 1 duration
METHOD method_25499 narrate (Ljava/lang/String;)V
ARG 1 message
METHOD method_25500 (Ljava/lang/String;Lnet/minecraft/class_4907$class_4908;)Lnet/minecraft/class_4907$class_4908;
ARG 2 parameters
CLASS class_4908 Parameters
FIELD field_22827 message Ljava/lang/String;
FIELD field_22828 rateLimiter Lcom/google/common/util/concurrent/RateLimiter;

2
mappings/net/minecraft/client/realms/Request.mapping
View File

@ -2,6 +2,8 @@ CLASS net/minecraft/class_4346 net/minecraft/client/realms/Request
FIELD field_19596 connection Ljava/net/HttpURLConnection;
FIELD field_19597 url Ljava/lang/String;
FIELD field_19598 connected Z
FIELD field_32096 READ_TIMEOUT I
FIELD field_32097 CONNECT_TIMEOUT I
METHOD <init> (Ljava/lang/String;II)V
ARG 1 url
ARG 2 connectTimeout

1
mappings/net/minecraft/client/realms/SizeUnit.mapping
View File

@ -1,5 +1,6 @@
CLASS net/minecraft/class_4428 net/minecraft/client/realms/SizeUnit
COMMENT Moved from RealmsUploadScreen.Unit in 20w10a.
FIELD field_32055 BASE I
METHOD method_25027 getLargestUnit (J)Lnet/minecraft/class_4428;
ARG 0 bytes
METHOD method_25028 convertToUnit (JLnet/minecraft/class_4428;)D

3
mappings/net/minecraft/client/realms/dto/RealmsServer.mapping
View File

@ -27,6 +27,9 @@ CLASS net/minecraft/class_4877 net/minecraft/client/realms/dto/RealmsServer
ARG 0 jsonArray
METHOD method_25056 parse (Lcom/google/gson/JsonObject;)Lnet/minecraft/class_4877;
ARG 0 node
METHOD method_25057 (Lnet/minecraft/class_4874;Lnet/minecraft/class_4874;)I
ARG 0 a
ARG 1 b
METHOD method_25058 sortInvited (Lnet/minecraft/class_4877;)V
ARG 0 server
METHOD method_25059 updateServerPing (Lnet/minecraft/class_4881;)V

12
mappings/net/minecraft/client/realms/dto/UploadInfo.mapping
View File

@ -3,6 +3,9 @@ CLASS net/minecraft/class_4888 net/minecraft/client/realms/dto/UploadInfo
FIELD field_22658 worldClosed Z
FIELD field_22659 token Ljava/lang/String;
FIELD field_22660 uploadEndpoint Ljava/net/URI;
FIELD field_26467 PROTOCOL_PATTERN Ljava/util/regex/Pattern;
FIELD field_32116 HTTP_PROTOCOL Ljava/lang/String;
FIELD field_32117 PORT I
METHOD <init> (ZLjava/lang/String;Ljava/net/URI;)V
ARG 1 worldClosed
ARG 2 token
@ -12,5 +15,14 @@ CLASS net/minecraft/class_4888 net/minecraft/client/realms/dto/UploadInfo
ARG 0 json
METHOD method_25089 getUploadEndpoint ()Ljava/net/URI;
METHOD method_25091 isWorldClosed ()Z
METHOD method_30861 getPort (II)I
ARG 0 port
ARG 1 urlPort
METHOD method_30862 getUrl (Ljava/lang/String;I)Ljava/net/URI;
ARG 0 url
ARG 1 port
METHOD method_30863 getUrlWithProtocol (Ljava/lang/String;Ljava/util/regex/Matcher;)Ljava/lang/String;
ARG 0 url
ARG 1 matcher
METHOD method_30864 createRequestContent (Ljava/lang/String;)Ljava/lang/String;
ARG 0 token

1
mappings/net/minecraft/client/realms/dto/WorldTemplatePaginatedList.mapping
View File

@ -8,3 +8,4 @@ CLASS net/minecraft/class_4891 net/minecraft/client/realms/dto/WorldTemplatePagi
ARG 1 size
METHOD method_25097 parse (Ljava/lang/String;)Lnet/minecraft/class_4891;
ARG 0 json
METHOD method_35688 isLastPage ()Z

1
mappings/net/minecraft/client/realms/exception/RetryCallException.mapping
View File

@ -1,5 +1,6 @@
CLASS net/minecraft/class_4356 net/minecraft/client/realms/exception/RetryCallException
FIELD field_19608 delaySeconds I
FIELD field_32118 DEFAULT_DELAY_SECONDS I
METHOD <init> (II)V
ARG 1 delaySeconds
ARG 2 httpResultCode

3
mappings/net/minecraft/client/realms/gui/BasicFetchRateLimiter.mapping
View File

@ -5,3 +5,6 @@ CLASS net/minecraft/class_5782 net/minecraft/client/realms/gui/BasicFetchRateLim
FIELD field_28451 lastRun Ljava/time/Instant;
METHOD <init> (Ljava/time/Duration;)V
ARG 1 period
METHOD <init> (Ljava/time/Duration;Ljava/util/function/Supplier;)V
ARG 1 period
ARG 2 clock

10
mappings/net/minecraft/client/realms/gui/RealmsDataFetcher.mapping
View File

@ -26,6 +26,10 @@ CLASS net/minecraft/class_4360 net/minecraft/client/realms/gui/RealmsDataFetcher
METHOD <init> (Lnet/minecraft/class_310;Lnet/minecraft/class_4341;)V
ARG 1 client
ARG 2 realms
METHOD <init> (Lnet/minecraft/class_310;Lnet/minecraft/class_4341;Lnet/minecraft/class_4432;)V
ARG 1 client
ARG 2 realms
ARG 3 persistence
METHOD method_21073 isStopped ()Z
METHOD method_21074 removeItem (Lnet/minecraft/class_4877;)V
ARG 1 server
@ -47,11 +51,17 @@ CLASS net/minecraft/class_4360 net/minecraft/client/realms/gui/RealmsDataFetcher
METHOD method_21099 scheduleTasks ()V
METHOD method_21100 cancelTasks ()V
METHOD method_21101 isActive ()Z
METHOD method_33410 (Lnet/minecraft/class_4360$class_4364;Ljava/lang/Boolean;)Ljava/lang/Boolean;
ARG 0 task
ARG 1 fetched
METHOD method_33411 (Ljava/util/concurrent/ScheduledFuture;)V
ARG 0 task
METHOD method_33412 updateServerList ()V
METHOD method_33413 updatePendingInvites ()V
METHOD method_33414 updateTrialAvailability ()V
METHOD method_33415 updateLiveStats ()V
METHOD method_33416 updateNews ()V
METHOD method_33417 fetchNews ()Lnet/minecraft/class_4432$class_4433;
CLASS class_4364 Task
FIELD field_19664 SERVER_LIST Lnet/minecraft/class_4360$class_4364;
FIELD field_19665 PENDING_INVITE Lnet/minecraft/class_4360$class_4364;

20
mappings/net/minecraft/client/realms/gui/RealmsWorldSlotButton.mapping
View File

@ -27,8 +27,26 @@ CLASS net/minecraft/class_4367 net/minecraft/client/realms/gui/RealmsWorldSlotBu
ARG 3 y
ARG 4 mouseX
ARG 5 mouseY
ARG 7 text
ARG 6 active
ARG 7 slotName
ARG 8 slotIndex
ARG 9 imageId
ARG 11 image
ARG 12 empty
ARG 13 minigame
ARG 14 action
ARG 15 actionPrompt
METHOD method_25099 getState ()Lnet/minecraft/class_4367$class_4370;
METHOD method_27454 getActionPromptAndMessage (Lnet/minecraft/class_4877;Ljava/lang/String;ZZLnet/minecraft/class_4367$class_4368;)Lcom/mojang/datafixers/util/Pair;
ARG 1 server
ARG 2 text
ARG 3 empty
ARG 4 minigame
ARG 5 action
METHOD method_27455 getAction (Lnet/minecraft/class_4877;ZZ)Lnet/minecraft/class_4367$class_4368;
ARG 0 server
ARG 1 active
ARG 2 minigame
CLASS class_4368 Action
FIELD field_19678 NOTHING Lnet/minecraft/class_4367$class_4368;
FIELD field_19679 SWITCH_SLOT Lnet/minecraft/class_4367$class_4368;

2
mappings/net/minecraft/client/realms/task/LongRunningTask.mapping
View File

@ -1,6 +1,7 @@
CLASS net/minecraft/class_4358 net/minecraft/client/realms/task/LongRunningTask
FIELD field_19638 longRunningMcoTaskScreen Lnet/minecraft/class_4398;
FIELD field_22731 LOGGER Lorg/apache/logging/log4j/Logger;
FIELD field_32132 MAX_RETRIES I
METHOD method_21065 aborted ()Z
METHOD method_21066 setScreen (Lnet/minecraft/class_4398;)V
ARG 1 longRunningMcoTaskScreen
@ -11,6 +12,7 @@ CLASS net/minecraft/class_4358 net/minecraft/client/realms/task/LongRunningTask
METHOD method_21071 abortTask ()V
METHOD method_25287 pause (J)V
COMMENT Moved from RealmsTasks in 20w10a.
ARG 0 seconds
METHOD method_25289 setScreen (Lnet/minecraft/class_437;)V
COMMENT Moved from Realms in 20w10a.
ARG 0 screen

4
mappings/net/minecraft/client/realms/task/RealmsConnectTask.mapping
View File

@ -1,4 +1,8 @@
CLASS net/minecraft/class_4438 net/minecraft/client/realms/task/RealmsConnectTask
FIELD field_20222 realmsConnect Lnet/minecraft/class_4902;
FIELD field_20223 address Lnet/minecraft/class_4878;
FIELD field_26922 server Lnet/minecraft/class_4877;
METHOD <init> (Lnet/minecraft/class_437;Lnet/minecraft/class_4877;Lnet/minecraft/class_4878;)V
ARG 1 lastScreen
ARG 2 server
ARG 3 address

12
mappings/net/minecraft/client/realms/task/RealmsGetServerDetailsTask.mapping
View File

@ -8,3 +8,15 @@ CLASS net/minecraft/class_4439 net/minecraft/client/realms/task/RealmsGetServerD
ARG 2 lastScreen
ARG 3 server
ARG 4 connectLock
METHOD method_25286 (Ljava/lang/Throwable;)Ljava/lang/Void;
ARG 1 throwable
METHOD method_32511 createConnectingScreen (Lnet/minecraft/class_4878;)Lnet/minecraft/class_4398;
ARG 1 address
METHOD method_32512 createResourcePackConfirmationScreen (Lnet/minecraft/class_4878;Ljava/util/function/Function;)Lnet/minecraft/class_4396;
ARG 1 address
ARG 2 connectingScreenCreator
METHOD method_32513 (Lnet/minecraft/class_4878;Ljava/util/function/Function;Z)V
ARG 3 confirmed
METHOD method_32515 downloadResourcePack (Lnet/minecraft/class_4878;)Ljava/util/concurrent/CompletableFuture;
ARG 1 address
METHOD method_32516 join ()Lnet/minecraft/class_4878;

3
mappings/net/minecraft/client/realms/task/ResettingWorldTask.mapping
View File

@ -6,3 +6,6 @@ CLASS net/minecraft/class_4440 net/minecraft/client/realms/task/ResettingWorldTa
ARG 1 serverId
ARG 3 title
ARG 4 callback
METHOD method_32517 resetWorld (Lnet/minecraft/class_4341;J)V
ARG 1 client
ARG 2 worldId

1
mappings/net/minecraft/client/realms/util/Errable.mapping
View File

@ -2,3 +2,4 @@ CLASS net/minecraft/class_5221 net/minecraft/client/realms/util/Errable
METHOD method_21067 error (Lnet/minecraft/class_2561;)V
ARG 1 errorMessage
METHOD method_27453 error (Ljava/lang/String;)V
ARG 1 errorMessage

1
mappings/net/minecraft/client/realms/util/RealmsPersistence.mapping
View File

@ -1,5 +1,6 @@
CLASS net/minecraft/class_4432 net/minecraft/client/realms/util/RealmsPersistence
FIELD field_22729 CHECKED_GSON Lnet/minecraft/class_4869;
FIELD field_32128 FILE_NAME Ljava/lang/String;
METHOD method_21549 readFile ()Lnet/minecraft/class_4432$class_4433;
METHOD method_21550 writeFile (Lnet/minecraft/class_4432$class_4433;)V
ARG 0 data

6
mappings/net/minecraft/client/realms/util/RealmsUtil.mapping
View File

@ -2,8 +2,14 @@ CLASS net/minecraft/class_4448 net/minecraft/client/realms/util/RealmsUtil
FIELD field_20260 gameProfileCache Lcom/google/common/cache/LoadingCache;
FIELD field_20261 authenticationService Lcom/mojang/authlib/yggdrasil/YggdrasilAuthenticationService;
FIELD field_20262 sessionService Lcom/mojang/authlib/minecraft/MinecraftSessionService;
FIELD field_32129 SECONDS_PER_MINUTE I
FIELD field_32130 SECONDS_PER_HOUR I
FIELD field_32131 SECONDS_PER_DAY I
METHOD method_21567 convertToAgePresentation (J)Ljava/lang/String;
ARG 0 milliseconds
METHOD method_21568 uuidToName (Ljava/lang/String;)Ljava/lang/String;
ARG 0 uuid
METHOD method_21569 getTextures (Ljava/lang/String;)Ljava/util/Map;
ARG 0 uuid
METHOD method_25282 convertToAgePresentation (Ljava/util/Date;)Ljava/lang/String;
ARG 0 date

2
mappings/net/minecraft/client/realms/util/TextRenderingUtils.mapping
View File

@ -17,6 +17,8 @@ CLASS net/minecraft/class_4450 net/minecraft/client/realms/util/TextRenderingUti
FIELD field_20266 segments Ljava/util/List;
METHOD <init> (Ljava/util/List;)V
ARG 1 segments
METHOD <init> ([Lnet/minecraft/class_4450$class_4452;)V
ARG 1 segments
METHOD equals (Ljava/lang/Object;)Z
ARG 1 o
CLASS class_4452 LineSegment