From 2fcb4af423991c2e35f6d543817737355c79c507 Mon Sep 17 00:00:00 2001 From: YanisBft Date: Thu, 14 Jan 2021 14:44:48 +0100 Subject: [PATCH] Client stuff and MultilineText class (#1955) --- .../minecraft/client/MinecraftClient.mapping | 25 ++++++++++ .../client/font/MultilineText.mapping | 46 +++++++++++++++++++ .../screen/world/CreateWorldScreen.mapping | 15 ++++++ .../gui/screen/world/EditWorldScreen.mapping | 6 +++ .../screen/world/MoreOptionsDialog.mapping | 6 ++- .../screen/world/OptimizeWorldScreen.mapping | 11 +++++ .../resource/VideoWarningManager.mapping | 6 +++ .../model/BlockStateModelGenerator.mapping | 6 +++ .../data/client/model/PropertiesMap.mapping | 11 ++++- .../data/client/model/Texture.mapping | 2 + .../data/client/model/TextureKey.mapping | 8 ++++ 11 files changed, 139 insertions(+), 3 deletions(-) create mode 100644 mappings/net/minecraft/client/font/MultilineText.mapping diff --git a/mappings/net/minecraft/client/MinecraftClient.mapping b/mappings/net/minecraft/client/MinecraftClient.mapping index 6fd3480bd6..90a6397474 100644 --- a/mappings/net/minecraft/client/MinecraftClient.mapping +++ b/mappings/net/minecraft/client/MinecraftClient.mapping @@ -255,6 +255,7 @@ CLASS net/minecraft/class_310 net/minecraft/client/MinecraftClient METHOD method_1582 getSkinProvider ()Lnet/minecraft/class_1071; METHOD method_1583 doItemUse ()V METHOD method_1584 setCurrentServerEntry (Lnet/minecraft/class_642;)V + ARG 1 serverEntry METHOD method_1586 getLevelStorage ()Lnet/minecraft/class_32; METHOD method_1587 addDetailsToCrashReport (Lnet/minecraft/class_128;)Lnet/minecraft/class_128; ARG 1 report @@ -302,6 +303,7 @@ CLASS net/minecraft/class_310 net/minecraft/client/MinecraftClient METHOD method_24043 createV4ResourcePackFactory (Ljava/util/function/Supplier;)Ljava/util/function/Supplier; ARG 0 packFactory METHOD method_24226 handleResourceReloadException (Ljava/lang/Throwable;)V + ARG 1 exception METHOD method_24287 getWindowTitle ()Ljava/lang/String; METHOD method_24288 updateWindowTitle ()V METHOD method_24289 isModded ()Z @@ -330,10 +332,21 @@ CLASS net/minecraft/class_310 net/minecraft/client/MinecraftClient ARG 1 sender METHOD method_29043 isMultiplayerEnabled ()Z METHOD method_29044 isOnlineChatEnabled ()Z + METHOD method_29598 loadDataPackSettings (Lnet/minecraft/class_32$class_5143;)Lnet/minecraft/class_5359; + ARG 0 storageSession METHOD method_29599 createSaveProperties (Lnet/minecraft/class_32$class_5143;Lnet/minecraft/class_5455$class_5457;Lnet/minecraft/class_3300;Lnet/minecraft/class_5359;)Lnet/minecraft/class_5219; ARG 0 session ARG 1 registryTracker ARG 2 resourceManager + ARG 3 dataPackSettings + METHOD method_29600 (Ljava/lang/String;Ljava/lang/Runnable;ZZ)V + ARG 3 shouldBackup + ARG 4 eraseCache + METHOD method_29601 showExperimentalWarning (Lnet/minecraft/class_310$class_5366;Ljava/lang/String;ZLjava/lang/Runnable;)V + ARG 1 worldLoadAction + ARG 2 levelName + ARG 3 legacyCustomized + ARG 4 onConfirm METHOD method_29603 (Lnet/minecraft/class_5455$class_5457;Lnet/minecraft/class_32$class_5143;Lnet/minecraft/class_310$class_5367;Lnet/minecraft/class_5219;Lcom/mojang/authlib/minecraft/MinecraftSessionService;Lcom/mojang/authlib/GameProfileRepository;Lnet/minecraft/class_3312;Ljava/lang/Thread;)Lnet/minecraft/class_1132; ARG 1 registryTracker ARG 2 session @@ -342,6 +355,12 @@ CLASS net/minecraft/class_310 net/minecraft/client/MinecraftClient ARG 6 profileRepository ARG 7 userCache ARG 8 serverThread + METHOD method_29604 createIntegratedResourceManager (Lnet/minecraft/class_5455$class_5457;Ljava/util/function/Function;Lcom/mojang/datafixers/util/Function4;ZLnet/minecraft/class_32$class_5143;)Lnet/minecraft/class_310$class_5367; + ARG 1 registryManager + ARG 2 dataPackSettingsGetter + ARG 3 savePropertiesGetter + ARG 4 safeMode + ARG 5 storageSession METHOD method_29606 startIntegratedServer (Ljava/lang/String;)V ARG 1 worldName METHOD method_29607 (Ljava/lang/String;Lnet/minecraft/class_1940;Lnet/minecraft/class_5455$class_5457;Lnet/minecraft/class_5285;)V @@ -352,9 +371,15 @@ CLASS net/minecraft/class_310 net/minecraft/client/MinecraftClient METHOD method_29610 startIntegratedServer (Ljava/lang/String;Lnet/minecraft/class_5455$class_5457;Ljava/util/function/Function;Lcom/mojang/datafixers/util/Function4;ZLnet/minecraft/class_310$class_5366;)V ARG 1 worldName ARG 2 registryTracker + ARG 3 dataPackSettingsGetter + ARG 4 savePropertiesGetter ARG 5 safeMode + ARG 6 worldLoadAction METHOD method_29611 isFabulousGraphicsOrBetter ()Z METHOD method_30049 getVideoWarningManager ()Lnet/minecraft/class_5407; + METHOD method_31186 onResourceReloadFailure (Ljava/lang/Throwable;Lnet/minecraft/class_2561;)V + ARG 1 exception + ARG 2 resourceName METHOD method_31320 getSocialInteractionsManager ()Lnet/minecraft/class_5520; METHOD method_31321 isConnectedToServer ()Z METHOD method_31974 getEntityModelLoader ()Lnet/minecraft/class_5599; diff --git a/mappings/net/minecraft/client/font/MultilineText.mapping b/mappings/net/minecraft/client/font/MultilineText.mapping new file mode 100644 index 0000000000..a2439a8ad5 --- /dev/null +++ b/mappings/net/minecraft/client/font/MultilineText.mapping @@ -0,0 +1,46 @@ +CLASS net/minecraft/class_5489 net/minecraft/client/font/MultilineText + FIELD field_26528 EMPTY Lnet/minecraft/class_5489; + METHOD method_30887 count ()I + METHOD method_30888 drawCenterWithShadow (Lnet/minecraft/class_4587;II)I + ARG 1 matrices + ARG 2 x + ARG 3 y + METHOD method_30889 drawCenterWithShadow (Lnet/minecraft/class_4587;IIII)I + ARG 1 matrices + ARG 2 x + ARG 3 y + ARG 4 lineHeight + ARG 5 color + METHOD method_30890 create (Lnet/minecraft/class_327;Lnet/minecraft/class_5348;I)Lnet/minecraft/class_5489; + ARG 0 renderer + ARG 1 text + ARG 2 width + METHOD method_30891 create (Lnet/minecraft/class_327;Lnet/minecraft/class_5348;II)Lnet/minecraft/class_5489; + ARG 0 renderer + ARG 1 text + ARG 2 width + ARG 3 maxLines + METHOD method_30892 create (Lnet/minecraft/class_327;[Lnet/minecraft/class_2561;)Lnet/minecraft/class_5489; + ARG 0 renderer + ARG 1 texts + METHOD method_30893 drawWithShadow (Lnet/minecraft/class_4587;IIII)I + ARG 1 matrices + ARG 2 x + ARG 3 y + ARG 4 lineHeight + ARG 5 color + METHOD method_30895 create (Lnet/minecraft/class_327;Ljava/util/List;)Lnet/minecraft/class_5489; + ARG 0 renderer + ARG 1 lines + METHOD method_30896 draw (Lnet/minecraft/class_4587;IIII)I + ARG 1 matrices + ARG 2 x + ARG 3 y + ARG 4 lineHeight + ARG 5 color + CLASS class_5490 Line + FIELD field_26531 text Lnet/minecraft/class_5481; + FIELD field_26532 width I + METHOD (Lnet/minecraft/class_5481;I)V + ARG 1 text + ARG 2 width diff --git a/mappings/net/minecraft/client/gui/screen/world/CreateWorldScreen.mapping b/mappings/net/minecraft/client/gui/screen/world/CreateWorldScreen.mapping index 2480962400..c94c187e6a 100644 --- a/mappings/net/minecraft/client/gui/screen/world/CreateWorldScreen.mapping +++ b/mappings/net/minecraft/client/gui/screen/world/CreateWorldScreen.mapping @@ -4,13 +4,16 @@ CLASS net/minecraft/class_525 net/minecraft/client/gui/screen/world/CreateWorldS FIELD field_24288 gameRules Lnet/minecraft/class_1928; FIELD field_24588 moreOptionsDialog Lnet/minecraft/class_5292; FIELD field_25478 dataPacksButton Lnet/minecraft/class_4185; + FIELD field_25479 dataPackSettings Lnet/minecraft/class_5359; FIELD field_25480 LOGGER Lorg/apache/logging/log4j/Logger; + FIELD field_25792 packManager Lnet/minecraft/class_3283; FIELD field_25898 GAME_MODE_TEXT Lnet/minecraft/class_2561; FIELD field_26598 ENTER_SEED_TEXT Lnet/minecraft/class_2561; FIELD field_26599 SEED_INFO_TEXT Lnet/minecraft/class_2561; FIELD field_26600 ENTER_NAME_TEXT Lnet/minecraft/class_2561; FIELD field_26601 RESULT_FOLDER_TEXT Lnet/minecraft/class_2561; FIELD field_26602 ALLOW_COMMANDS_INFO_TEXT Lnet/minecraft/class_2561; + FIELD field_27998 currentDifficulty Lnet/minecraft/class_1267; FIELD field_3178 hardcore Z FIELD field_3179 tweakedCheats Z FIELD field_3182 enableCheatsButton Lnet/minecraft/class_5676; @@ -27,6 +30,16 @@ CLASS net/minecraft/class_525 net/minecraft/client/gui/screen/world/CreateWorldS FIELD field_3201 currentMode Lnet/minecraft/class_525$class_4539; FIELD field_3202 moreOptionsOpen Z FIELD field_3205 createLevelButton Lnet/minecraft/class_4185; + METHOD (Lnet/minecraft/class_437;Lnet/minecraft/class_1940;Lnet/minecraft/class_5285;Ljava/nio/file/Path;Lnet/minecraft/class_5359;Lnet/minecraft/class_5455$class_5457;)V + ARG 1 parent + ARG 2 levelInfo + ARG 3 generatorOptions + ARG 5 dataPackSettings + ARG 6 registryManager + METHOD (Lnet/minecraft/class_437;Lnet/minecraft/class_5359;Lnet/minecraft/class_5292;)V + ARG 1 parent + ARG 2 dataPackSettings + ARG 3 moreOptionsDialog METHOD method_22365 tweakDefaultsTo (Lnet/minecraft/class_525$class_4539;)V METHOD method_2710 setMoreOptionsOpen (Z)V ARG 1 moreOptionsOpen @@ -39,6 +52,8 @@ CLASS net/minecraft/class_525 net/minecraft/client/gui/screen/world/CreateWorldS METHOD method_28084 setMoreOptionsOpen ()V METHOD method_29692 (Lnet/minecraft/class_4185;)V ARG 1 button + METHOD method_31130 create (Lnet/minecraft/class_437;)Lnet/minecraft/class_525; + ARG 0 parent CLASS class_4539 Mode FIELD field_20628 translationSuffix Ljava/lang/String; FIELD field_20629 defaultGameMode Lnet/minecraft/class_1934; diff --git a/mappings/net/minecraft/client/gui/screen/world/EditWorldScreen.mapping b/mappings/net/minecraft/client/gui/screen/world/EditWorldScreen.mapping index 4f541f3d40..fccc91eacd 100644 --- a/mappings/net/minecraft/client/gui/screen/world/EditWorldScreen.mapping +++ b/mappings/net/minecraft/client/gui/screen/world/EditWorldScreen.mapping @@ -1,5 +1,6 @@ CLASS net/minecraft/class_524 net/minecraft/client/gui/screen/world/EditWorldScreen FIELD field_23776 LOGGER Lorg/apache/logging/log4j/Logger; + FIELD field_23777 storageSession Lnet/minecraft/class_32$class_5143; FIELD field_25481 GSON Lcom/google/gson/Gson; FIELD field_26603 ENTER_NAME_TEXT Lnet/minecraft/class_2561; FIELD field_3168 saveButton Lnet/minecraft/class_4185; @@ -7,5 +8,10 @@ CLASS net/minecraft/class_524 net/minecraft/client/gui/screen/world/EditWorldScr FIELD field_3170 levelNameTextField Lnet/minecraft/class_342; METHOD (Lit/unimi/dsi/fastutil/booleans/BooleanConsumer;Lnet/minecraft/class_32$class_5143;)V ARG 1 callback + ARG 2 storageSession METHOD method_2691 commit ()V METHOD method_2701 backupLevel (Lnet/minecraft/class_32$class_5143;)Z + ARG 0 storageSession + METHOD method_29784 onBackupConfirm (Lnet/minecraft/class_32;Ljava/lang/String;)V + ARG 0 storage + ARG 1 levelName diff --git a/mappings/net/minecraft/client/gui/screen/world/MoreOptionsDialog.mapping b/mappings/net/minecraft/client/gui/screen/world/MoreOptionsDialog.mapping index bd5f61446b..00533fa774 100644 --- a/mappings/net/minecraft/client/gui/screen/world/MoreOptionsDialog.mapping +++ b/mappings/net/minecraft/client/gui/screen/world/MoreOptionsDialog.mapping @@ -11,10 +11,12 @@ CLASS net/minecraft/class_5292 net/minecraft/client/gui/screen/world/MoreOptions FIELD field_24600 seed Ljava/util/OptionalLong; FIELD field_25046 LOGGER Lorg/apache/logging/log4j/Logger; FIELD field_25047 CUSTOM_TEXT Lnet/minecraft/class_2561; - FIELD field_25048 importOptionsButton Lnet/minecraft/class_4185; + FIELD field_25048 importSettingsButton Lnet/minecraft/class_4185; FIELD field_25049 generatorType Ljava/util/Optional; FIELD field_25483 registryManager Lnet/minecraft/class_5455$class_5457; FIELD field_26604 MAP_FEATURES_INFO_TEXT Lnet/minecraft/class_2561; + FIELD field_26605 generatorInfoText Lnet/minecraft/class_5489; + FIELD field_28000 SELECT_SETTINGS_FILE_TEXT Lnet/minecraft/class_2561; METHOD (Lnet/minecraft/class_5455$class_5457;Lnet/minecraft/class_5285;Ljava/util/Optional;Ljava/util/OptionalLong;)V ARG 1 registryManager ARG 2 generatorOptions @@ -43,3 +45,5 @@ CLASS net/minecraft/class_5292 net/minecraft/client/gui/screen/world/MoreOptions ARG 1 serverResourceManager METHOD method_31133 (Lnet/minecraft/class_5455$class_5457;Lnet/minecraft/class_5285;)V ARG 2 generatorOptions + METHOD method_32682 disableBonusItems ()V + METHOD method_32684 enableBonusItems ()V diff --git a/mappings/net/minecraft/client/gui/screen/world/OptimizeWorldScreen.mapping b/mappings/net/minecraft/client/gui/screen/world/OptimizeWorldScreen.mapping index 88de29e435..a846392754 100644 --- a/mappings/net/minecraft/client/gui/screen/world/OptimizeWorldScreen.mapping +++ b/mappings/net/minecraft/client/gui/screen/world/OptimizeWorldScreen.mapping @@ -5,3 +5,14 @@ CLASS net/minecraft/class_527 net/minecraft/client/gui/screen/world/OptimizeWorl FIELD field_3234 updater Lnet/minecraft/class_1257; METHOD (Lit/unimi/dsi/fastutil/booleans/BooleanConsumer;Lcom/mojang/datafixers/DataFixer;Lnet/minecraft/class_32$class_5143;Lnet/minecraft/class_1940;ZLcom/google/common/collect/ImmutableSet;)V ARG 1 callback + ARG 2 dataFixer + ARG 3 storageSession + ARG 4 levelInfo + ARG 5 eraseCache + ARG 6 worlds + METHOD method_27031 create (Lnet/minecraft/class_310;Lit/unimi/dsi/fastutil/booleans/BooleanConsumer;Lcom/mojang/datafixers/DataFixer;Lnet/minecraft/class_32$class_5143;Z)Lnet/minecraft/class_527; + ARG 0 client + ARG 1 callback + ARG 2 dataFixer + ARG 3 storageSession + ARG 4 eraseCache diff --git a/mappings/net/minecraft/client/resource/VideoWarningManager.mapping b/mappings/net/minecraft/client/resource/VideoWarningManager.mapping index 408c48de14..2847499c3d 100644 --- a/mappings/net/minecraft/client/resource/VideoWarningManager.mapping +++ b/mappings/net/minecraft/client/resource/VideoWarningManager.mapping @@ -9,6 +9,8 @@ CLASS net/minecraft/class_5407 net/minecraft/client/resource/VideoWarningManager METHOD method_30057 compilePatterns (Lcom/google/gson/JsonArray;Ljava/util/List;)V ARG 0 array ARG 1 patterns + METHOD method_30059 (Ljava/util/List;Lcom/google/gson/JsonElement;)V + ARG 1 json METHOD method_30060 getRendererWarning ()Ljava/lang/String; METHOD method_30061 loadWarnlist (Lnet/minecraft/class_3300;Lnet/minecraft/class_3695;)Lcom/google/gson/JsonObject; ARG 0 resourceManager @@ -22,6 +24,10 @@ CLASS net/minecraft/class_5407 net/minecraft/client/resource/VideoWarningManager METHOD method_30141 shouldWarn ()Z METHOD method_30142 hasCancelledAfterWarning ()Z METHOD method_30143 reset ()V + METHOD method_30919 (Ljava/lang/StringBuilder;Ljava/lang/String;Ljava/lang/String;)V + ARG 1 key + ARG 2 value + METHOD method_30920 getWarningsAsString ()Ljava/lang/String; CLASS class_5408 WarningPatternLoader FIELD field_25691 rendererPatterns Ljava/util/List; FIELD field_25692 versionPatterns Ljava/util/List; diff --git a/mappings/net/minecraft/data/client/model/BlockStateModelGenerator.mapping b/mappings/net/minecraft/data/client/model/BlockStateModelGenerator.mapping index 6c5de8637f..bfbdb2f365 100644 --- a/mappings/net/minecraft/data/client/model/BlockStateModelGenerator.mapping +++ b/mappings/net/minecraft/data/client/model/BlockStateModelGenerator.mapping @@ -367,6 +367,12 @@ CLASS net/minecraft/class_4910 net/minecraft/data/client/model/BlockStateModelGe 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_31064 registerRod (Lnet/minecraft/class_2248;)V + ARG 1 block + METHOD method_32802 registerPointedDripstone ()V + METHOD method_33128 registerSculkSensor ()V CLASS class_4911 BuiltinModelPool FIELD field_22835 modelId Lnet/minecraft/class_2960; METHOD (Lnet/minecraft/class_4910;Lnet/minecraft/class_2960;Lnet/minecraft/class_2248;)V diff --git a/mappings/net/minecraft/data/client/model/PropertiesMap.mapping b/mappings/net/minecraft/data/client/model/PropertiesMap.mapping index 5e116138cc..380338d718 100644 --- a/mappings/net/minecraft/data/client/model/PropertiesMap.mapping +++ b/mappings/net/minecraft/data/client/model/PropertiesMap.mapping @@ -5,7 +5,14 @@ CLASS net/minecraft/class_4934 net/minecraft/data/client/model/PropertiesMap COMMENT

This object is immutable. FIELD field_22881 EMPTY Lnet/minecraft/class_4934; FIELD field_22882 COMPARATOR Ljava/util/Comparator; - FIELD field_22883 propertyValues Ljava/util/List; + FIELD field_22883 values Ljava/util/List; + METHOD (Ljava/util/List;)V + ARG 1 values METHOD method_25818 empty ()Lnet/minecraft/class_4934; - METHOD method_25820 with (Lnet/minecraft/class_4934;)Lnet/minecraft/class_4934; + METHOD method_25819 withValue (Lnet/minecraft/class_2769$class_4933;)Lnet/minecraft/class_4934; + ARG 1 value + METHOD method_25820 copyOf (Lnet/minecraft/class_4934;)Lnet/minecraft/class_4934; + ARG 1 propertiesMap + METHOD method_25821 withValues ([Lnet/minecraft/class_2769$class_4933;)Lnet/minecraft/class_4934; + ARG 0 values METHOD method_25822 asString ()Ljava/lang/String; diff --git a/mappings/net/minecraft/data/client/model/Texture.mapping b/mappings/net/minecraft/data/client/model/Texture.mapping index 8e2732b54e..4288e1c985 100644 --- a/mappings/net/minecraft/data/client/model/Texture.mapping +++ b/mappings/net/minecraft/data/client/model/Texture.mapping @@ -115,3 +115,5 @@ CLASS net/minecraft/class_4944 net/minecraft/data/client/model/Texture ARG 0 top METHOD method_25911 layer0 (Lnet/minecraft/class_2248;)Lnet/minecraft/class_4944; ARG 0 block + METHOD method_27167 campfire (Lnet/minecraft/class_2248;)Lnet/minecraft/class_4944; + ARG 0 block diff --git a/mappings/net/minecraft/data/client/model/TextureKey.mapping b/mappings/net/minecraft/data/client/model/TextureKey.mapping index 1fd4e8c7fa..1956b41d3b 100644 --- a/mappings/net/minecraft/data/client/model/TextureKey.mapping +++ b/mappings/net/minecraft/data/client/model/TextureKey.mapping @@ -1,5 +1,13 @@ CLASS net/minecraft/class_4945 net/minecraft/data/client/model/TextureKey FIELD field_23007 name Ljava/lang/String; FIELD field_23008 parent Lnet/minecraft/class_4945; + METHOD (Ljava/lang/String;Lnet/minecraft/class_4945;)V + ARG 1 name + ARG 2 parent METHOD method_25912 getName ()Ljava/lang/String; METHOD method_25913 getParent ()Lnet/minecraft/class_4945; + METHOD method_27043 of (Ljava/lang/String;)Lnet/minecraft/class_4945; + ARG 0 name + METHOD method_27044 of (Ljava/lang/String;Lnet/minecraft/class_4945;)Lnet/minecraft/class_4945; + ARG 0 name + ARG 1 parent