From b012ade3abb88852c42175228d55013c03f3a995 Mon Sep 17 00:00:00 2001 From: apple502j <33279053+apple502j@users.noreply.github.com> Date: Wed, 23 Nov 2022 21:29:21 +0900 Subject: [PATCH] 1.19.3-pre1 stuff (#3425) --- .../client/gui/screen/OpenToLanScreen.mapping | 3 ++ .../SocialInteractionsPlayerListEntry.mapping | 2 ++ .../TropicalFishColorFeatureRenderer.mapping | 12 +++++++ .../client/world/BiomeColorCache.mapping | 3 ++ .../client/BlockStateModelGenerator.mapping | 6 ++-- .../painting/PaintingEntity.mapping | 4 +++ .../minecraft/entity/mob/MobEntity.mapping | 4 +++ .../entity/mob/ZombifiedPiglinEntity.mapping | 1 + .../entity/passive/AxolotlEntity.mapping | 1 + .../entity/TypeSpecificPredicate.mapping | 33 +++++++++++++++++++ mappings/net/minecraft/util/DyeColor.mapping | 5 +++ mappings/net/minecraft/util/Util.mapping | 2 -- 12 files changed, 72 insertions(+), 4 deletions(-) diff --git a/mappings/net/minecraft/client/gui/screen/OpenToLanScreen.mapping b/mappings/net/minecraft/client/gui/screen/OpenToLanScreen.mapping index 1e71f2a654..21a8a4f6c7 100644 --- a/mappings/net/minecraft/client/gui/screen/OpenToLanScreen.mapping +++ b/mappings/net/minecraft/client/gui/screen/OpenToLanScreen.mapping @@ -6,10 +6,13 @@ CLASS net/minecraft/class_436 net/minecraft/client/gui/screen/OpenToLanScreen FIELD field_25890 GAME_MODE_TEXT Lnet/minecraft/class_2561; FIELD field_26545 OTHER_PLAYERS_TEXT Lnet/minecraft/class_2561; FIELD field_41106 UNAVAILABLE_PORT_TEXT Lnet/minecraft/class_2561; + FIELD field_41107 ERROR_TEXT_COLOR I FIELD field_41108 PORT_TEXT Lnet/minecraft/class_2561; FIELD field_41109 INVALID_PORT_TEXT Lnet/minecraft/class_2561; FIELD field_41110 port I FIELD field_41111 portField Lnet/minecraft/class_342; + FIELD field_41629 MIN_PORT I + FIELD field_41630 MAX_PORT I METHOD (Lnet/minecraft/class_437;)V ARG 1 screen METHOD method_19850 (Lnet/minecraft/class_4185;)V diff --git a/mappings/net/minecraft/client/gui/screen/multiplayer/SocialInteractionsPlayerListEntry.mapping b/mappings/net/minecraft/client/gui/screen/multiplayer/SocialInteractionsPlayerListEntry.mapping index 48b4ee7f76..fdff5d5267 100644 --- a/mappings/net/minecraft/client/gui/screen/multiplayer/SocialInteractionsPlayerListEntry.mapping +++ b/mappings/net/minecraft/client/gui/screen/multiplayer/SocialInteractionsPlayerListEntry.mapping @@ -57,3 +57,5 @@ CLASS net/minecraft/class_5519 net/minecraft/client/gui/screen/multiplayer/Socia METHOD method_44754 isOffline ()Z METHOD method_44756 hasSentMessage ()Z METHOD method_47634 getReportButtonTooltip ()Lnet/minecraft/class_7919; + METHOD method_47905 setShowButtonVisible (Z)V + ARG 1 showButtonVisible diff --git a/mappings/net/minecraft/client/render/entity/feature/TropicalFishColorFeatureRenderer.mapping b/mappings/net/minecraft/client/render/entity/feature/TropicalFishColorFeatureRenderer.mapping index 373ba0818e..15634eb099 100644 --- a/mappings/net/minecraft/client/render/entity/feature/TropicalFishColorFeatureRenderer.mapping +++ b/mappings/net/minecraft/client/render/entity/feature/TropicalFishColorFeatureRenderer.mapping @@ -1,5 +1,17 @@ CLASS net/minecraft/class_1001 net/minecraft/client/render/entity/feature/TropicalFishColorFeatureRenderer FIELD field_17157 smallModel Lnet/minecraft/class_612; + FIELD field_41646 KOB_TEXTURE Lnet/minecraft/class_2960; + FIELD field_41647 SUNSTREAK_TEXTURE Lnet/minecraft/class_2960; + FIELD field_41648 SNOOPER_TEXTURE Lnet/minecraft/class_2960; + FIELD field_41649 DASHER_TEXTURE Lnet/minecraft/class_2960; + FIELD field_41650 BRINELY_TEXTURE Lnet/minecraft/class_2960; + FIELD field_41651 SPOTTY_TEXTURE Lnet/minecraft/class_2960; + FIELD field_41652 FLOPPER_TEXTURE Lnet/minecraft/class_2960; + FIELD field_41653 STRIPEY_TEXTURE Lnet/minecraft/class_2960; + FIELD field_41654 GLITTER_TEXTURE Lnet/minecraft/class_2960; + FIELD field_41655 BLOCKFISH_TEXTURE Lnet/minecraft/class_2960; + FIELD field_41656 BETTY_TEXTURE Lnet/minecraft/class_2960; + FIELD field_41657 CLAYFISH_TEXTURE Lnet/minecraft/class_2960; FIELD field_4903 largeModel Lnet/minecraft/class_615; METHOD (Lnet/minecraft/class_3883;Lnet/minecraft/class_5599;)V ARG 1 context diff --git a/mappings/net/minecraft/client/world/BiomeColorCache.mapping b/mappings/net/minecraft/client/world/BiomeColorCache.mapping index e4de1a0760..b9b44a2d32 100644 --- a/mappings/net/minecraft/client/world/BiomeColorCache.mapping +++ b/mappings/net/minecraft/client/world/BiomeColorCache.mapping @@ -23,8 +23,11 @@ CLASS net/minecraft/class_4700 net/minecraft/client/world/BiomeColorCache FIELD field_34796 colors Lit/unimi/dsi/fastutil/ints/Int2ObjectArrayMap; FIELD field_34797 lock Ljava/util/concurrent/locks/ReentrantReadWriteLock; FIELD field_34798 XZ_COLORS_SIZE I + FIELD field_41610 needsCacheRefresh Z METHOD method_38527 createDefault ()[I METHOD method_38528 get (I)[I ARG 1 y METHOD method_38529 (I)[I ARG 1 y + METHOD method_47894 needsCacheRefresh ()Z + METHOD method_47895 setNeedsCacheRefresh ()V diff --git a/mappings/net/minecraft/data/client/BlockStateModelGenerator.mapping b/mappings/net/minecraft/data/client/BlockStateModelGenerator.mapping index d72abf3442..19b138f073 100644 --- a/mappings/net/minecraft/data/client/BlockStateModelGenerator.mapping +++ b/mappings/net/minecraft/data/client/BlockStateModelGenerator.mapping @@ -499,20 +499,22 @@ CLASS net/minecraft/class_4910 net/minecraft/data/client/BlockStateModelGenerato METHOD method_47811 (Lnet/minecraft/class_4922;Lnet/minecraft/class_2960;Lnet/minecraft/class_2350;Lnet/minecraft/class_4936$class_4937;)V ARG 3 direction ARG 4 rotation - METHOD method_47812 (Lnet/minecraft/class_4922;Lnet/minecraft/class_4918$class_4921;Lnet/minecraft/class_4936$class_4937;)V + METHOD method_47812 supplyChiseledBookshelfModels (Lnet/minecraft/class_4922;Lnet/minecraft/class_4918$class_4921;Lnet/minecraft/class_4936$class_4937;)V ARG 1 blockStateSupplier ARG 2 facingCondition ARG 3 rotation METHOD method_47813 (Lnet/minecraft/class_4922;Lnet/minecraft/class_4918$class_4921;Lnet/minecraft/class_4936$class_4937;Lnet/minecraft/class_2746;Lnet/minecraft/class_4942;)V ARG 4 property ARG 5 model - METHOD method_47814 (Lnet/minecraft/class_4922;Lnet/minecraft/class_4918$class_4921;Lnet/minecraft/class_4936$class_4937;Lnet/minecraft/class_2746;Lnet/minecraft/class_4942;Z)V + METHOD method_47814 supplyChiseledBookshelfModel (Lnet/minecraft/class_4922;Lnet/minecraft/class_4918$class_4921;Lnet/minecraft/class_4936$class_4937;Lnet/minecraft/class_2746;Lnet/minecraft/class_4942;Z)V ARG 1 blockStateSupplier ARG 2 facingCondition ARG 3 rotation ARG 4 property ARG 5 model ARG 6 occupied + METHOD method_47815 (Lnet/minecraft/class_4942;Ljava/lang/String;Lnet/minecraft/class_4944;Lnet/minecraft/class_4910$class_7987;)Lnet/minecraft/class_2960; + ARG 4 key 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/entity/decoration/painting/PaintingEntity.mapping b/mappings/net/minecraft/entity/decoration/painting/PaintingEntity.mapping index 2a005ef181..2a9016b6dc 100644 --- a/mappings/net/minecraft/entity/decoration/painting/PaintingEntity.mapping +++ b/mappings/net/minecraft/entity/decoration/painting/PaintingEntity.mapping @@ -23,3 +23,7 @@ CLASS net/minecraft/class_1534 net/minecraft/entity/decoration/painting/Painting ARG 0 variant METHOD method_43404 getVariant ()Lnet/minecraft/class_6880; METHOD method_43405 getDefaultVariant ()Lnet/minecraft/class_6880; + METHOD method_45378 (Lnet/minecraft/class_2960;)Lnet/minecraft/class_5321; + ARG 0 id + METHOD method_45379 (Lnet/minecraft/class_6880$class_6883;)Lnet/minecraft/class_6880; + ARG 0 entry diff --git a/mappings/net/minecraft/entity/mob/MobEntity.mapping b/mappings/net/minecraft/entity/mob/MobEntity.mapping index 5dfef9ea38..4b7195d5f2 100644 --- a/mappings/net/minecraft/entity/mob/MobEntity.mapping +++ b/mappings/net/minecraft/entity/mob/MobEntity.mapping @@ -156,6 +156,10 @@ CLASS net/minecraft/class_1308 net/minecraft/entity/mob/MobEntity COMMENT utilizing this method. METHOD method_46644 getSlotToEquip (Lnet/minecraft/class_1799;)Lnet/minecraft/class_1304; ARG 1 stack + METHOD method_47824 (Lnet/minecraft/class_1352;)Z + ARG 0 goal + METHOD method_47825 clearGoals (Ljava/util/function/Predicate;)V + ARG 1 predicate METHOD method_5929 getDropChance (Lnet/minecraft/class_1304;)F ARG 1 slot METHOD method_5930 setForwardSpeed (F)V diff --git a/mappings/net/minecraft/entity/mob/ZombifiedPiglinEntity.mapping b/mappings/net/minecraft/entity/mob/ZombifiedPiglinEntity.mapping index 4ec086fee4..e2ecaf0361 100644 --- a/mappings/net/minecraft/entity/mob/ZombifiedPiglinEntity.mapping +++ b/mappings/net/minecraft/entity/mob/ZombifiedPiglinEntity.mapping @@ -6,6 +6,7 @@ CLASS net/minecraft/class_1590 net/minecraft/entity/mob/ZombifiedPiglinEntity FIELD field_25608 angerPassingCooldown I FIELD field_25609 ANGER_PASSING_COOLDOWN_RANGE Lnet/minecraft/class_6019; FIELD field_41029 EYE_HEIGHT F + FIELD field_41598 BABY_EYE_HEIGHT_OFFSET F FIELD field_7307 ATTACKING_SPEED_BOOST Lnet/minecraft/class_1322; FIELD field_7308 angrySoundDelay I FIELD field_7311 ATTACKING_SPEED_BOOST_ID Ljava/util/UUID; diff --git a/mappings/net/minecraft/entity/passive/AxolotlEntity.mapping b/mappings/net/minecraft/entity/passive/AxolotlEntity.mapping index 61fff39d36..02cde1ba9b 100644 --- a/mappings/net/minecraft/entity/passive/AxolotlEntity.mapping +++ b/mappings/net/minecraft/entity/passive/AxolotlEntity.mapping @@ -60,6 +60,7 @@ CLASS net/minecraft/class_5762 net/minecraft/entity/passive/AxolotlEntity ARG 1 playingDead METHOD method_35175 appreciatePlayer (Lnet/minecraft/class_5762;Lnet/minecraft/class_1309;)V ARG 0 axolotl + ARG 1 entity METHOD method_36282 hydrateFromPotion ()V METHOD method_38987 canSpawn (Lnet/minecraft/class_1299;Lnet/minecraft/class_5425;Lnet/minecraft/class_3730;Lnet/minecraft/class_2338;Lnet/minecraft/class_5819;)Z ARG 0 type diff --git a/mappings/net/minecraft/predicate/entity/TypeSpecificPredicate.mapping b/mappings/net/minecraft/predicate/entity/TypeSpecificPredicate.mapping index c266e3db2e..d712e33c4c 100644 --- a/mappings/net/minecraft/predicate/entity/TypeSpecificPredicate.mapping +++ b/mappings/net/minecraft/predicate/entity/TypeSpecificPredicate.mapping @@ -25,9 +25,42 @@ CLASS net/minecraft/class_7376 net/minecraft/predicate/entity/TypeSpecificPredic FIELD field_38729 CAT Lnet/minecraft/class_7380; FIELD field_38730 FROG Lnet/minecraft/class_7380; FIELD field_38731 TYPES Lcom/google/common/collect/BiMap; + FIELD field_41534 AXOLOTL Lnet/minecraft/class_7380; + FIELD field_41535 BOAT Lnet/minecraft/class_7380; + FIELD field_41536 FOX Lnet/minecraft/class_7380; + FIELD field_41537 MOOSHROOM Lnet/minecraft/class_7380; + FIELD field_41538 PAINTING Lnet/minecraft/class_7380; + FIELD field_41539 RABBIT Lnet/minecraft/class_7380; + FIELD field_41540 HORSE Lnet/minecraft/class_7380; + FIELD field_41541 LLAMA Lnet/minecraft/class_7380; + FIELD field_41542 VILLAGER Lnet/minecraft/class_7380; + FIELD field_41543 PARROT Lnet/minecraft/class_7380; + FIELD field_41544 TROPICAL_FISH Lnet/minecraft/class_7380; METHOD method_43100 (Lnet/minecraft/class_1297;)Ljava/util/Optional; ARG 0 entity METHOD method_43101 (Lcom/google/gson/JsonObject;)Lnet/minecraft/class_7376; ARG 0 json METHOD method_43102 (Lnet/minecraft/class_1297;)Ljava/util/Optional; ARG 0 entity + METHOD method_47829 (Lnet/minecraft/class_1297;)Ljava/util/Optional; + ARG 0 entity + METHOD method_47830 (Lnet/minecraft/class_1297;)Ljava/util/Optional; + ARG 0 entity + METHOD method_47831 (Lnet/minecraft/class_1297;)Ljava/util/Optional; + ARG 0 entity + METHOD method_47832 (Lnet/minecraft/class_1297;)Ljava/util/Optional; + ARG 0 entity + METHOD method_47833 (Lnet/minecraft/class_1297;)Ljava/util/Optional; + ARG 0 entity + METHOD method_47834 (Lnet/minecraft/class_1297;)Ljava/util/Optional; + ARG 0 entity + METHOD method_47835 (Lnet/minecraft/class_1297;)Ljava/util/Optional; + ARG 0 entity + METHOD method_47836 (Lnet/minecraft/class_1297;)Ljava/util/Optional; + ARG 0 entity + METHOD method_47837 (Lnet/minecraft/class_1297;)Ljava/util/Optional; + ARG 0 entity + METHOD method_47838 (Lnet/minecraft/class_1297;)Ljava/util/Optional; + ARG 0 entity + METHOD method_47839 (Lnet/minecraft/class_1297;)Ljava/util/Optional; + ARG 0 entity diff --git a/mappings/net/minecraft/util/DyeColor.mapping b/mappings/net/minecraft/util/DyeColor.mapping index 38902cd15c..3fb9459d08 100644 --- a/mappings/net/minecraft/util/DyeColor.mapping +++ b/mappings/net/minecraft/util/DyeColor.mapping @@ -1,6 +1,7 @@ CLASS net/minecraft/class_1767 net/minecraft/util/DyeColor COMMENT An enum representing 16 dye colors. FIELD field_16537 signColor I + FIELD field_41600 CODEC Lnet/minecraft/class_3542$class_7292; FIELD field_7943 colorComponents [F FIELD field_7948 name Ljava/lang/String; FIELD field_7950 BY_FIREWORK_COLOR Lit/unimi/dsi/fastutil/ints/Int2ObjectOpenHashMap; @@ -49,3 +50,7 @@ CLASS net/minecraft/class_1767 net/minecraft/util/DyeColor ARG 1 defaultColor METHOD method_7794 getMapColor ()Lnet/minecraft/class_3620; COMMENT {@return the corresponding map color} + METHOD method_7795 (Lnet/minecraft/class_1767;)Ljava/lang/Integer; + ARG 0 color + METHOD method_7797 (Lnet/minecraft/class_1767;)Lnet/minecraft/class_1767; + ARG 0 color diff --git a/mappings/net/minecraft/util/Util.mapping b/mappings/net/minecraft/util/Util.mapping index 1ad729abd0..0a395db262 100644 --- a/mappings/net/minecraft/util/Util.mapping +++ b/mappings/net/minecraft/util/Util.mapping @@ -312,8 +312,6 @@ CLASS net/minecraft/class_156 net/minecraft/util/Util COMMENT {@return the current time formatted using {@link #DATE_TIME_FORMATTER}} METHOD method_47526 getResult (Lcom/mojang/serialization/DataResult;Ljava/util/function/Function;)Ljava/lang/Object; COMMENT {@return the result wrapped in {@code result}} - COMMENT - COMMENT @throws Exception if {@code result} has an error ARG 0 result ARG 1 exceptionGetter METHOD method_645 previous (Ljava/lang/Iterable;Ljava/lang/Object;)Ljava/lang/Object;