From e817f40aa803343691586a3e456c91b029e1680c Mon Sep 17 00:00:00 2001 From: apple502j <33279053+apple502j@users.noreply.github.com> Date: Thu, 2 Mar 2023 23:07:09 +0900 Subject: [PATCH] 1.19.4 pre3 stuff (#3521) * 1.19.4-pre3 stuff * Rename FocusedRect and FocusedPos --- .../net/minecraft/client/Keyboard.mapping | 2 ++ .../FocusedPos.mapping => ScreenPos.mapping} | 4 +-- ...FocusedRect.mapping => ScreenRect.mapping} | 4 +-- .../screen/world/SelectWorldScreen.mapping | 2 ++ .../client/gui/tab/TabManager.mapping | 1 + .../gui/widget/TabNavigationWidget.mapping | 1 + .../client/option/GameOptions.mapping | 1 + .../client/texture/DynamicTexture.mapping | 4 +++ .../minecraft/client/texture/Sprite.mapping | 16 +++++----- .../client/texture/SpriteAtlasTexture.mapping | 8 +++++ .../client/texture/SpriteLoader.mapping | 31 +++++++++++++++++-- .../client/texture/TextureManager.mapping | 7 +++++ .../client/texture/TextureStitcher.mapping | 4 +-- .../minecraft/entity/ai/brain/Brain.mapping | 3 ++ .../entity/damage/DamageSource.mapping | 2 ++ 15 files changed, 74 insertions(+), 16 deletions(-) rename mappings/net/minecraft/client/gui/{navigation/FocusedPos.mapping => ScreenPos.mapping} (68%) rename mappings/net/minecraft/client/gui/{navigation/FocusedRect.mapping => ScreenRect.mapping} (94%) create mode 100644 mappings/net/minecraft/client/texture/DynamicTexture.mapping diff --git a/mappings/net/minecraft/client/Keyboard.mapping b/mappings/net/minecraft/client/Keyboard.mapping index b808db2051..f72100889c 100644 --- a/mappings/net/minecraft/client/Keyboard.mapping +++ b/mappings/net/minecraft/client/Keyboard.mapping @@ -72,3 +72,5 @@ CLASS net/minecraft/class_309 net/minecraft/client/Keyboard METHOD method_37273 addDebugMessage (Lnet/minecraft/class_124;Lnet/minecraft/class_2561;)V ARG 1 formatting ARG 2 text + METHOD method_49711 (Ljava/nio/file/Path;Lnet/minecraft/class_2583;)Lnet/minecraft/class_2583; + ARG 1 style diff --git a/mappings/net/minecraft/client/gui/navigation/FocusedPos.mapping b/mappings/net/minecraft/client/gui/ScreenPos.mapping similarity index 68% rename from mappings/net/minecraft/client/gui/navigation/FocusedPos.mapping rename to mappings/net/minecraft/client/gui/ScreenPos.mapping index 6dc9bdd2f7..dae2eeecb7 100644 --- a/mappings/net/minecraft/client/gui/navigation/FocusedPos.mapping +++ b/mappings/net/minecraft/client/gui/ScreenPos.mapping @@ -1,5 +1,5 @@ -CLASS net/minecraft/class_8029 net/minecraft/client/gui/navigation/FocusedPos - COMMENT Represents the position of an {@link FocusedRect}. +CLASS net/minecraft/class_8029 net/minecraft/client/gui/ScreenPos + COMMENT Represents the position of a {@link ScreenRect}. METHOD method_48245 getComponent (Lnet/minecraft/class_8027;)I ARG 1 axis METHOD method_48246 of (Lnet/minecraft/class_8027;II)Lnet/minecraft/class_8029; diff --git a/mappings/net/minecraft/client/gui/navigation/FocusedRect.mapping b/mappings/net/minecraft/client/gui/ScreenRect.mapping similarity index 94% rename from mappings/net/minecraft/client/gui/navigation/FocusedRect.mapping rename to mappings/net/minecraft/client/gui/ScreenRect.mapping index bc511fbb50..c3cfa10fc6 100644 --- a/mappings/net/minecraft/client/gui/navigation/FocusedRect.mapping +++ b/mappings/net/minecraft/client/gui/ScreenRect.mapping @@ -1,5 +1,5 @@ -CLASS net/minecraft/class_8030 net/minecraft/client/gui/navigation/FocusedRect - COMMENT A rectangle on the screen that is focused. +CLASS net/minecraft/class_8030 net/minecraft/client/gui/ScreenRect + COMMENT A rectangle on the screen. FIELD field_41835 EMPTY Lnet/minecraft/class_8030; METHOD (IIII)V ARG 1 sameAxis diff --git a/mappings/net/minecraft/client/gui/screen/world/SelectWorldScreen.mapping b/mappings/net/minecraft/client/gui/screen/world/SelectWorldScreen.mapping index d6d7329c39..2127976377 100644 --- a/mappings/net/minecraft/client/gui/screen/world/SelectWorldScreen.mapping +++ b/mappings/net/minecraft/client/gui/screen/world/SelectWorldScreen.mapping @@ -13,6 +13,8 @@ CLASS net/minecraft/class_526 net/minecraft/client/gui/screen/world/SelectWorldS METHOD method_19939 (Lnet/minecraft/class_4185;)V ARG 1 button METHOD method_19940 worldSelected (ZZ)V + ARG 1 buttonsActive + ARG 2 deleteButtonActive METHOD method_19941 (Lnet/minecraft/class_4185;)V ARG 1 button METHOD method_19942 (Lnet/minecraft/class_4185;)V diff --git a/mappings/net/minecraft/client/gui/tab/TabManager.mapping b/mappings/net/minecraft/client/gui/tab/TabManager.mapping index 1956715e18..f5f2279ac5 100644 --- a/mappings/net/minecraft/client/gui/tab/TabManager.mapping +++ b/mappings/net/minecraft/client/gui/tab/TabManager.mapping @@ -9,6 +9,7 @@ CLASS net/minecraft/class_8088 net/minecraft/client/gui/tab/TabManager METHOD method_48614 getCurrentTab ()Lnet/minecraft/class_8087; METHOD method_48615 setCurrentTab (Lnet/minecraft/class_8087;Z)V ARG 1 tab + ARG 2 clickSound METHOD method_48616 setTabArea (Lnet/minecraft/class_8030;)V ARG 1 tabArea METHOD method_48617 tick ()V diff --git a/mappings/net/minecraft/client/gui/widget/TabNavigationWidget.mapping b/mappings/net/minecraft/client/gui/widget/TabNavigationWidget.mapping index 6f6961db83..690c5aa6f1 100644 --- a/mappings/net/minecraft/client/gui/widget/TabNavigationWidget.mapping +++ b/mappings/net/minecraft/client/gui/widget/TabNavigationWidget.mapping @@ -16,6 +16,7 @@ CLASS net/minecraft/class_8089 net/minecraft/client/gui/widget/TabNavigationWidg ARG 1 width METHOD method_48987 selectTab (IZ)V ARG 1 index + ARG 2 clickSound METHOD method_48988 trySwitchTabsWithKey (I)Z ARG 1 keyCode METHOD method_48989 getCurrentTabIndex ()I diff --git a/mappings/net/minecraft/client/option/GameOptions.mapping b/mappings/net/minecraft/client/option/GameOptions.mapping index c098c69170..853d388c19 100644 --- a/mappings/net/minecraft/client/option/GameOptions.mapping +++ b/mappings/net/minecraft/client/option/GameOptions.mapping @@ -221,6 +221,7 @@ CLASS net/minecraft/class_315 net/minecraft/client/option/GameOptions FIELD field_42482 damageTiltStrength Lnet/minecraft/class_7172; FIELD field_43043 HIGH_CONTRAST_TOOLTIP Lnet/minecraft/class_2561; FIELD field_43044 highContrast Lnet/minecraft/class_7172; + FIELD field_43110 MAX_SERIALIZABLE_GUI_SCALE I METHOD (Lnet/minecraft/class_310;Ljava/io/File;)V ARG 1 client ARG 2 optionsFile diff --git a/mappings/net/minecraft/client/texture/DynamicTexture.mapping b/mappings/net/minecraft/client/texture/DynamicTexture.mapping new file mode 100644 index 0000000000..18d163148f --- /dev/null +++ b/mappings/net/minecraft/client/texture/DynamicTexture.mapping @@ -0,0 +1,4 @@ +CLASS net/minecraft/class_8215 net/minecraft/client/texture/DynamicTexture + METHOD method_49712 save (Lnet/minecraft/class_2960;Ljava/nio/file/Path;)V + ARG 1 id + ARG 2 path diff --git a/mappings/net/minecraft/client/texture/Sprite.mapping b/mappings/net/minecraft/client/texture/Sprite.mapping index 48ee8518a6..b326edbafb 100644 --- a/mappings/net/minecraft/client/texture/Sprite.mapping +++ b/mappings/net/minecraft/client/texture/Sprite.mapping @@ -3,17 +3,17 @@ CLASS net/minecraft/class_1058 net/minecraft/client/texture/Sprite FIELD field_40553 contents Lnet/minecraft/class_7764; FIELD field_5256 y I FIELD field_5258 x I - FIELD field_5267 vMax F - FIELD field_5268 vMin F - FIELD field_5269 uMax F - FIELD field_5270 uMin F + FIELD field_5267 maxV F + FIELD field_5268 minV F + FIELD field_5269 maxU F + FIELD field_5270 minU F METHOD (Lnet/minecraft/class_2960;Lnet/minecraft/class_7764;IIII)V ARG 1 atlasId ARG 2 contents - ARG 3 maxLevel - ARG 4 atlasWidth - ARG 5 atlasHeight - ARG 6 x + ARG 3 atlasWidth + ARG 4 atlasHeight + ARG 5 x + ARG 6 y METHOD method_23841 getFrameDeltaFactor ()F METHOD method_23842 getAnimationFrameDelta ()F METHOD method_24108 getTextureSpecificVertexConsumer (Lnet/minecraft/class_4588;)Lnet/minecraft/class_4588; diff --git a/mappings/net/minecraft/client/texture/SpriteAtlasTexture.mapping b/mappings/net/minecraft/client/texture/SpriteAtlasTexture.mapping index b63bb026b5..a78948a394 100644 --- a/mappings/net/minecraft/client/texture/SpriteAtlasTexture.mapping +++ b/mappings/net/minecraft/client/texture/SpriteAtlasTexture.mapping @@ -2,6 +2,9 @@ CLASS net/minecraft/class_1059 net/minecraft/client/texture/SpriteAtlasTexture FIELD field_17898 PARTICLE_ATLAS_TEXTURE Lnet/minecraft/class_2960; FIELD field_17899 maxTextureSize I FIELD field_21749 id Lnet/minecraft/class_2960; + FIELD field_43113 width I + FIELD field_43114 height I + FIELD field_43115 mipLevel I FIELD field_5275 BLOCK_ATLAS_TEXTURE Lnet/minecraft/class_2960; FIELD field_5276 animatedSprites Ljava/util/List; FIELD field_5277 spritesToLoad Ljava/util/List; @@ -15,8 +18,13 @@ CLASS net/minecraft/class_1059 net/minecraft/client/texture/SpriteAtlasTexture METHOD method_45848 upload (Lnet/minecraft/class_7766$class_7767;)V ARG 1 stitchResult METHOD method_45849 dumpAtlasInfos (Ljava/nio/file/Path;Ljava/lang/String;Ljava/util/Map;)V + ARG 0 path + ARG 1 id + ARG 2 sprites METHOD method_45850 getMaxTextureSize ()I METHOD method_4601 clear ()V METHOD method_4608 getSprite (Lnet/minecraft/class_2960;)Lnet/minecraft/class_1058; ARG 1 id METHOD method_4612 tickAnimatedSprites ()V + METHOD method_49713 getWidth ()I + METHOD method_49714 getHeight ()I diff --git a/mappings/net/minecraft/client/texture/SpriteLoader.mapping b/mappings/net/minecraft/client/texture/SpriteLoader.mapping index 34b6147aa9..4af5fd4a24 100644 --- a/mappings/net/minecraft/client/texture/SpriteLoader.mapping +++ b/mappings/net/minecraft/client/texture/SpriteLoader.mapping @@ -2,9 +2,13 @@ CLASS net/minecraft/class_7766 net/minecraft/client/texture/SpriteLoader FIELD field_40548 LOGGER Lorg/slf4j/Logger; FIELD field_40549 id Lnet/minecraft/class_2960; FIELD field_40550 maxTextureSize I + FIELD field_43111 width I + FIELD field_43112 height I METHOD (Lnet/minecraft/class_2960;III)V ARG 1 id ARG 2 maxTextureSize + ARG 3 width + ARG 4 height METHOD method_45826 (ILnet/minecraft/class_1058;)V ARG 1 sprite METHOD method_45829 load (Lnet/minecraft/class_2960;Lnet/minecraft/class_3298;)Lnet/minecraft/class_7764; @@ -13,12 +17,35 @@ CLASS net/minecraft/class_7766 net/minecraft/client/texture/SpriteLoader METHOD method_45835 (Lnet/minecraft/class_1055$class_7769;)Ljava/lang/String; ARG 0 sprite METHOD method_45836 collectStitchedSprites (Lnet/minecraft/class_1055;II)Ljava/util/Map; + ARG 1 stitcher + ARG 2 atlasWidth + ARG 3 atlasHeight METHOD method_45837 fromAtlas (Lnet/minecraft/class_1059;)Lnet/minecraft/class_7766; ARG 0 atlasTexture METHOD method_45841 (Ljava/util/Map;IILnet/minecraft/class_7764;II)V ARG 4 info - ARG 5 width - ARG 6 height + ARG 5 x + ARG 6 y + METHOD method_47659 (ILjava/util/concurrent/Executor;Ljava/util/List;)Lnet/minecraft/class_7766$class_7767; + ARG 3 sprites + METHOD method_47661 load (Lnet/minecraft/class_3300;Lnet/minecraft/class_2960;ILjava/util/concurrent/Executor;)Ljava/util/concurrent/CompletableFuture; + ARG 1 resourceManager + ARG 2 path + ARG 3 mipLevel + ARG 4 executor + METHOD method_47662 (Ljava/util/List;)Ljava/util/List; + ARG 0 sprites + METHOD method_47663 stitch (Ljava/util/List;ILjava/util/concurrent/Executor;)Lnet/minecraft/class_7766$class_7767; + ARG 1 sprites + ARG 2 mipLevel + ARG 3 executor + METHOD method_47664 loadAll (Ljava/util/List;Ljava/util/concurrent/Executor;)Ljava/util/concurrent/CompletableFuture; + ARG 0 sources + ARG 1 executor + METHOD method_47665 (Ljava/util/concurrent/Executor;Ljava/util/List;)Ljava/util/concurrent/CompletionStage; + ARG 1 sources + METHOD method_47666 (Ljava/util/concurrent/Executor;Ljava/util/function/Supplier;)Ljava/util/concurrent/CompletableFuture; + ARG 1 source CLASS class_7767 StitchResult METHOD method_45845 whenComplete ()Ljava/util/concurrent/CompletableFuture; METHOD method_45846 (Ljava/lang/Void;)Lnet/minecraft/class_7766$class_7767; diff --git a/mappings/net/minecraft/client/texture/TextureManager.mapping b/mappings/net/minecraft/client/texture/TextureManager.mapping index 651cb6434b..ce88810d48 100644 --- a/mappings/net/minecraft/client/texture/TextureManager.mapping +++ b/mappings/net/minecraft/client/texture/TextureManager.mapping @@ -37,3 +37,10 @@ CLASS net/minecraft/class_1060 net/minecraft/client/texture/TextureManager ARG 1 id METHOD method_4619 getTexture (Lnet/minecraft/class_2960;)Lnet/minecraft/class_1044; ARG 1 id + METHOD method_49715 dumpDynamicTextures (Ljava/nio/file/Path;)V + ARG 1 path + METHOD method_49716 (Ljava/nio/file/Path;Lnet/minecraft/class_2960;Lnet/minecraft/class_1044;)V + ARG 1 id + ARG 2 texture + METHOD method_49717 dumpDynamicTexturesInternal (Ljava/nio/file/Path;)V + ARG 1 path diff --git a/mappings/net/minecraft/client/texture/TextureStitcher.mapping b/mappings/net/minecraft/client/texture/TextureStitcher.mapping index 0dd90f156e..d99bc7f1b3 100644 --- a/mappings/net/minecraft/client/texture/TextureStitcher.mapping +++ b/mappings/net/minecraft/client/texture/TextureStitcher.mapping @@ -63,8 +63,8 @@ CLASS net/minecraft/class_1055 net/minecraft/client/texture/TextureStitcher CLASS class_4726 SpriteConsumer METHOD load (Lnet/minecraft/class_1055$class_7769;II)V ARG 1 info - ARG 2 width - ARG 3 height + ARG 2 x + ARG 3 y CLASS class_7769 Stitchable METHOD method_45807 getWidth ()I METHOD method_45815 getHeight ()I diff --git a/mappings/net/minecraft/entity/ai/brain/Brain.mapping b/mappings/net/minecraft/entity/ai/brain/Brain.mapping index 6035bcdde4..03baa21236 100644 --- a/mappings/net/minecraft/entity/ai/brain/Brain.mapping +++ b/mappings/net/minecraft/entity/ai/brain/Brain.mapping @@ -150,6 +150,9 @@ CLASS net/minecraft/class_4095 net/minecraft/entity/ai/brain/Brain ARG 1 type METHOD method_46873 getOptionalMemory (Lnet/minecraft/class_4140;)Ljava/util/Optional; ARG 1 type + METHOD method_49709 forgetAll ()V + METHOD method_49710 (Lnet/minecraft/class_4140;)V + ARG 1 type CLASS 1 METHOD decode (Lcom/mojang/serialization/DynamicOps;Lcom/mojang/serialization/MapLike;)Lcom/mojang/serialization/DataResult; ARG 1 ops diff --git a/mappings/net/minecraft/entity/damage/DamageSource.mapping b/mappings/net/minecraft/entity/damage/DamageSource.mapping index 9ae4fd8a4f..5b70179915 100644 --- a/mappings/net/minecraft/entity/damage/DamageSource.mapping +++ b/mappings/net/minecraft/entity/damage/DamageSource.mapping @@ -26,6 +26,8 @@ CLASS net/minecraft/class_1282 net/minecraft/entity/damage/DamageSource METHOD method_48791 getStoredPosition ()Lnet/minecraft/class_243; METHOD method_48792 getType ()Lnet/minecraft/class_8110; METHOD method_48793 getTypeRegistryEntry ()Lnet/minecraft/class_6880; + METHOD method_49708 isOf (Lnet/minecraft/class_5321;)Z + ARG 1 typeKey METHOD method_5506 getDeathMessage (Lnet/minecraft/class_1309;)Lnet/minecraft/class_2561; ARG 1 killed METHOD method_5510 getPosition ()Lnet/minecraft/class_243;