From 1f91bbccaa82d0cc22131629d6e9d862dc0aaac0 Mon Sep 17 00:00:00 2001 From: Shnupbups Date: Wed, 17 Apr 2024 12:33:42 +1000 Subject: [PATCH] 1.20.5-pre3 stuff (#3846) * 1.20.5-pre3 stuff * a bit clearer --- .../client/gui/screen/Screen.mapping | 2 ++ .../gui/widget/OptionListWidget.mapping | 1 + .../client/option/SimpleOption.mapping | 7 +++++++ .../component/DataComponentType.mapping | 2 ++ .../component/DataComponentTypes.mapping | 1 + .../component/type/ContainerComponent.mapping | 1 + mappings/net/minecraft/entity/Entity.mapping | 2 +- ...r.mapping => ProjectileDeflection.mapping} | 12 ++++++++++- .../projectile/ProjectileEntity.mapping | 9 ++++++++ .../net/minecraft/nbt/NbtCompound.mapping | 2 ++ .../minecraft/registry/RegistryOps.mapping | 11 ++++++++++ .../structure/ShipwreckGenerator.mapping | 14 +++++++++++++ .../net/minecraft/test/TestContext.mapping | 4 ++++ .../minecraft/util/dynamic/CodecCache.mapping | 21 +++++++++++++++++++ 14 files changed, 87 insertions(+), 2 deletions(-) rename mappings/net/minecraft/entity/{ProjectileDeflector.mapping => ProjectileDeflection.mapping} (58%) create mode 100644 mappings/net/minecraft/util/dynamic/CodecCache.mapping diff --git a/mappings/net/minecraft/client/gui/screen/Screen.mapping b/mappings/net/minecraft/client/gui/screen/Screen.mapping index b8037bdf8f..8a43911359 100644 --- a/mappings/net/minecraft/client/gui/screen/Screen.mapping +++ b/mappings/net/minecraft/client/gui/screen/Screen.mapping @@ -31,6 +31,7 @@ CLASS net/minecraft/class_437 net/minecraft/client/gui/screen/Screen FIELD field_49896 FOOTER_SEPARATOR_TEXTURE Lnet/minecraft/class_2960; FIELD field_49897 INWORLD_HEADER_SEPARATOR_TEXTURE Lnet/minecraft/class_2960; FIELD field_49898 INWORLD_FOOTER_SEPARATOR_TEXTURE Lnet/minecraft/class_2960; + FIELD field_51515 lastPanoramaTickTime J METHOD (Lnet/minecraft/class_2561;)V ARG 1 title METHOD method_25393 tick ()V @@ -197,6 +198,7 @@ CLASS net/minecraft/class_437 net/minecraft/client/gui/screen/Screen ARG 6 width ARG 7 height METHOD method_59840 clearTooltip ()V + METHOD method_59870 getPanoramaTickDelta ()F CLASS class_6390 SelectedElementNarrationData FIELD field_33825 selectable Lnet/minecraft/class_6379; FIELD field_33826 index I diff --git a/mappings/net/minecraft/client/gui/widget/OptionListWidget.mapping b/mappings/net/minecraft/client/gui/widget/OptionListWidget.mapping index 0f39aadf85..cef26b480a 100644 --- a/mappings/net/minecraft/client/gui/widget/OptionListWidget.mapping +++ b/mappings/net/minecraft/client/gui/widget/OptionListWidget.mapping @@ -18,6 +18,7 @@ CLASS net/minecraft/class_353 net/minecraft/client/gui/widget/OptionListWidget ARG 1 option METHOD method_58227 addAll (Ljava/util/List;)V ARG 1 widgets + METHOD method_59869 applyAllPendingValues ()V CLASS class_354 WidgetEntry FIELD field_18214 widgets Ljava/util/List; FIELD field_49484 WIDGET_X_SPACING I diff --git a/mappings/net/minecraft/client/option/SimpleOption.mapping b/mappings/net/minecraft/client/option/SimpleOption.mapping index e84e756795..f840722692 100644 --- a/mappings/net/minecraft/client/option/SimpleOption.mapping +++ b/mappings/net/minecraft/client/option/SimpleOption.mapping @@ -181,11 +181,16 @@ CLASS net/minecraft/class_7172 net/minecraft/client/option/SimpleOption COMMENT A set of callbacks for a slider of integer values with a fixed minimum and maximum values. COMMENT COMMENT @see Callbacks + METHOD (II)V + ARG 1 minInclusive + ARG 2 maxInclusive CLASS class_7175 OptionSliderWidgetImpl FIELD field_37872 option Lnet/minecraft/class_7172; FIELD field_37873 callbacks Lnet/minecraft/class_7172$class_7176; FIELD field_37874 tooltipFactory Lnet/minecraft/class_7172$class_7277; FIELD field_41334 changeCallback Ljava/util/function/Consumer; + FIELD field_51513 timeToApply Ljava/lang/Long; + FIELD field_51514 applyValueImmediately Z METHOD (Lnet/minecraft/class_315;IIIILnet/minecraft/class_7172;Lnet/minecraft/class_7172$class_7176;Lnet/minecraft/class_7172$class_7277;Ljava/util/function/Consumer;Z)V ARG 1 options ARG 2 x @@ -196,6 +201,8 @@ CLASS net/minecraft/class_7172 net/minecraft/client/option/SimpleOption ARG 7 callbacks ARG 8 tooltipFactory ARG 9 changeCallback + ARG 10 applyValueImmediately + METHOD method_59868 applyPendingValue ()V CLASS class_7176 SliderCallbacks COMMENT A set of callbacks for slider options. COMMENT diff --git a/mappings/net/minecraft/component/DataComponentType.mapping b/mappings/net/minecraft/component/DataComponentType.mapping index 5be9d482b6..74ec0a7827 100644 --- a/mappings/net/minecraft/component/DataComponentType.mapping +++ b/mappings/net/minecraft/component/DataComponentType.mapping @@ -15,11 +15,13 @@ CLASS net/minecraft/class_9331 net/minecraft/component/DataComponentType CLASS class_9332 Builder FIELD field_49602 codec Lcom/mojang/serialization/Codec; FIELD field_49603 packetCodec Lnet/minecraft/class_9139; + FIELD field_51517 cacheCodec Z METHOD method_57880 build ()Lnet/minecraft/class_9331; METHOD method_57881 codec (Lcom/mojang/serialization/Codec;)Lnet/minecraft/class_9331$class_9332; ARG 1 codec METHOD method_57882 packetCodec (Lnet/minecraft/class_9139;)Lnet/minecraft/class_9331$class_9332; ARG 1 packetCodec + METHOD method_59871 cacheCodec ()Lnet/minecraft/class_9331$class_9332; CLASS class_9333 SimpleDataComponentType FIELD field_49604 codec Lcom/mojang/serialization/Codec; FIELD field_49605 packetCodec Lnet/minecraft/class_9139; diff --git a/mappings/net/minecraft/component/DataComponentTypes.mapping b/mappings/net/minecraft/component/DataComponentTypes.mapping index 027cc1d80e..16bd93d41a 100644 --- a/mappings/net/minecraft/component/DataComponentTypes.mapping +++ b/mappings/net/minecraft/component/DataComponentTypes.mapping @@ -1,5 +1,6 @@ CLASS net/minecraft/class_9334 net/minecraft/component/DataComponentTypes FIELD field_49627 DEFAULT_ITEM_COMPONENTS Lnet/minecraft/class_9323; + FIELD field_51518 CODEC_CACHE Lnet/minecraft/class_9684; METHOD method_57884 (Lnet/minecraft/class_9331$class_9332;)Lnet/minecraft/class_9331$class_9332; ARG 0 builder METHOD method_57885 (Lnet/minecraft/class_9331$class_9332;)Lnet/minecraft/class_9331$class_9332; diff --git a/mappings/net/minecraft/component/type/ContainerComponent.mapping b/mappings/net/minecraft/component/type/ContainerComponent.mapping index 12be510b5e..bbfa9292d9 100644 --- a/mappings/net/minecraft/component/type/ContainerComponent.mapping +++ b/mappings/net/minecraft/component/type/ContainerComponent.mapping @@ -5,6 +5,7 @@ CLASS net/minecraft/class_9288 net/minecraft/component/type/ContainerComponent FIELD field_49337 MAX_SLOTS I FIELD field_49338 stacks Lnet/minecraft/class_2371; FIELD field_51410 ALL_SLOTS_EMPTY I + FIELD field_51511 hashCode I METHOD (I)V ARG 1 size METHOD (Ljava/util/List;)V diff --git a/mappings/net/minecraft/entity/Entity.mapping b/mappings/net/minecraft/entity/Entity.mapping index 5c1ef5d54c..5b57e51c58 100644 --- a/mappings/net/minecraft/entity/Entity.mapping +++ b/mappings/net/minecraft/entity/Entity.mapping @@ -1006,7 +1006,7 @@ CLASS net/minecraft/class_1297 net/minecraft/entity/Entity COMMENT @see #getSteppingBlockState METHOD method_55668 getVehicleAttachmentPos (Lnet/minecraft/class_1297;)Lnet/minecraft/class_243; ARG 1 vehicle - METHOD method_56071 getProjectileDeflector (Lnet/minecraft/class_1676;)Lnet/minecraft/class_9109; + METHOD method_56071 getProjectileDeflection (Lnet/minecraft/class_1676;)Lnet/minecraft/class_9109; ARG 1 projectile METHOD method_56072 getAttachments ()Lnet/minecraft/class_9066; METHOD method_56073 setOnFireForTicks (I)V diff --git a/mappings/net/minecraft/entity/ProjectileDeflector.mapping b/mappings/net/minecraft/entity/ProjectileDeflection.mapping similarity index 58% rename from mappings/net/minecraft/entity/ProjectileDeflector.mapping rename to mappings/net/minecraft/entity/ProjectileDeflection.mapping index 9b07441dea..4e7535f3c9 100644 --- a/mappings/net/minecraft/entity/ProjectileDeflector.mapping +++ b/mappings/net/minecraft/entity/ProjectileDeflection.mapping @@ -1,6 +1,8 @@ -CLASS net/minecraft/class_9109 net/minecraft/entity/ProjectileDeflector +CLASS net/minecraft/class_9109 net/minecraft/entity/ProjectileDeflection FIELD field_48347 NONE Lnet/minecraft/class_9109; FIELD field_48348 SIMPLE Lnet/minecraft/class_9109; + FIELD field_51509 REDIRECTED Lnet/minecraft/class_9109; + FIELD field_51510 MOMENTUM_REDIRECTED Lnet/minecraft/class_9109; METHOD deflect (Lnet/minecraft/class_1676;Lnet/minecraft/class_1297;Lnet/minecraft/class_5819;)V ARG 1 projectile ARG 2 hitEntity @@ -13,3 +15,11 @@ CLASS net/minecraft/class_9109 net/minecraft/entity/ProjectileDeflector ARG 0 projectile ARG 1 hitEntity ARG 2 random + METHOD method_59861 (Lnet/minecraft/class_1676;Lnet/minecraft/class_1297;Lnet/minecraft/class_5819;)V + ARG 0 projectile + ARG 1 hitEntity + ARG 2 random + METHOD method_59862 (Lnet/minecraft/class_1676;Lnet/minecraft/class_1297;Lnet/minecraft/class_5819;)V + ARG 0 projectile + ARG 1 hitEntity + ARG 2 random diff --git a/mappings/net/minecraft/entity/projectile/ProjectileEntity.mapping b/mappings/net/minecraft/entity/projectile/ProjectileEntity.mapping index 1b2489ce75..2b2aeff4fc 100644 --- a/mappings/net/minecraft/entity/projectile/ProjectileEntity.mapping +++ b/mappings/net/minecraft/entity/projectile/ProjectileEntity.mapping @@ -46,6 +46,15 @@ CLASS net/minecraft/class_1676 net/minecraft/entity/projectile/ProjectileEntity ARG 7 power ARG 8 uncertainty METHOD method_59525 onDeflected (Lnet/minecraft/class_1297;Z)V + ARG 1 deflector + ARG 2 fromAttack + METHOD method_59859 deflect (Lnet/minecraft/class_9109;Lnet/minecraft/class_1297;Lnet/minecraft/class_1297;Z)V + ARG 1 deflection + ARG 2 deflector + ARG 3 owner + ARG 4 fromAttack + METHOD method_59860 hitOrDeflect (Lnet/minecraft/class_239;)Lnet/minecraft/class_9109; + ARG 1 hitResult METHOD method_7432 setOwner (Lnet/minecraft/class_1297;)V ARG 1 entity METHOD method_7454 onEntityHit (Lnet/minecraft/class_3966;)V diff --git a/mappings/net/minecraft/nbt/NbtCompound.mapping b/mappings/net/minecraft/nbt/NbtCompound.mapping index f7a7d7aa0e..ad57e9f776 100644 --- a/mappings/net/minecraft/nbt/NbtCompound.mapping +++ b/mappings/net/minecraft/nbt/NbtCompound.mapping @@ -317,6 +317,8 @@ CLASS net/minecraft/class_2487 net/minecraft/nbt/NbtCompound COMMENT @see #putByteArray(String, byte[]) ARG 1 key ARG 2 value + METHOD method_59873 shallowCopy ()Lnet/minecraft/class_2487; + METHOD method_59874 entrySet ()Ljava/util/Set; CLASS 1 METHOD method_53888 scanCompound (Ljava/io/DataInput;Lnet/minecraft/class_6836;Lnet/minecraft/class_2505;)Lnet/minecraft/class_6836$class_6838; ARG 0 input diff --git a/mappings/net/minecraft/registry/RegistryOps.mapping b/mappings/net/minecraft/registry/RegistryOps.mapping index 4804c262bd..4949c32ab8 100644 --- a/mappings/net/minecraft/registry/RegistryOps.mapping +++ b/mappings/net/minecraft/registry/RegistryOps.mapping @@ -3,6 +3,8 @@ CLASS net/minecraft/class_6903 net/minecraft/registry/RegistryOps METHOD (Lcom/mojang/serialization/DynamicOps;Lnet/minecraft/class_6903$class_7863;)V ARG 1 delegate ARG 2 registryInfoGetter + METHOD equals (Ljava/lang/Object;)Z + ARG 1 o METHOD method_40414 of (Lcom/mojang/serialization/DynamicOps;Lnet/minecraft/class_6903$class_7863;)Lnet/minecraft/class_6903; ARG 0 delegate ARG 1 registryInfoGetter @@ -42,3 +44,12 @@ CLASS net/minecraft/class_6903 net/minecraft/registry/RegistryOps CLASS class_7863 RegistryInfoGetter METHOD method_46623 getRegistryInfo (Lnet/minecraft/class_5321;)Ljava/util/Optional; ARG 1 registryRef + CLASS class_9683 RegistryInfoLookup + FIELD field_51501 wrapperLookup Lnet/minecraft/class_7225$class_7874; + FIELD field_51502 registryInfos Ljava/util/Map; + METHOD (Lnet/minecraft/class_7225$class_7874;)V + ARG 1 wrapperLookup + METHOD equals (Ljava/lang/Object;)Z + ARG 1 o + METHOD method_59855 computeRegistryInfo (Lnet/minecraft/class_5321;)Ljava/util/Optional; + ARG 1 registryRef diff --git a/mappings/net/minecraft/structure/ShipwreckGenerator.mapping b/mappings/net/minecraft/structure/ShipwreckGenerator.mapping index e475aed38d..1fad302d4f 100644 --- a/mappings/net/minecraft/structure/ShipwreckGenerator.mapping +++ b/mappings/net/minecraft/structure/ShipwreckGenerator.mapping @@ -3,6 +3,14 @@ CLASS net/minecraft/class_3415 net/minecraft/structure/ShipwreckGenerator FIELD field_14535 REGULAR_TEMPLATES [Lnet/minecraft/class_2960; FIELD field_14536 DEFAULT_POSITION Lnet/minecraft/class_2338; FIELD field_34939 LOOT_TABLES Ljava/util/Map; + FIELD field_51512 LARGE_SIZE_LIMIT I + METHOD method_59864 addParts (Lnet/minecraft/class_3485;Lnet/minecraft/class_2338;Lnet/minecraft/class_2470;Lnet/minecraft/class_6130;Lnet/minecraft/class_5819;Z)Lnet/minecraft/class_3415$class_3416; + ARG 0 structureTemplateManager + ARG 1 pos + ARG 2 rotation + ARG 3 holder + ARG 4 random + ARG 5 beached CLASS class_3416 Piece FIELD field_14538 grounded Z METHOD (Lnet/minecraft/class_3485;Lnet/minecraft/class_2487;)V @@ -18,3 +26,9 @@ CLASS net/minecraft/class_3415 net/minecraft/structure/ShipwreckGenerator ARG 0 rotation METHOD method_35453 (Lnet/minecraft/class_2487;Lnet/minecraft/class_2960;)Lnet/minecraft/class_3492; ARG 1 id + METHOD method_59865 findGroundedY (ILnet/minecraft/class_5819;)I + ARG 1 y + ARG 2 random + METHOD method_59866 setY (I)V + ARG 1 y + METHOD method_59867 isTooLargeForNormalGeneration ()Z diff --git a/mappings/net/minecraft/test/TestContext.mapping b/mappings/net/minecraft/test/TestContext.mapping index c372d6f9a1..f816a84afb 100644 --- a/mappings/net/minecraft/test/TestContext.mapping +++ b/mappings/net/minecraft/test/TestContext.mapping @@ -427,3 +427,7 @@ CLASS net/minecraft/class_4516 net/minecraft/test/TestContext METHOD method_57100 spawnItem (Lnet/minecraft/class_1792;Lnet/minecraft/class_243;)Lnet/minecraft/class_1542; ARG 1 item ARG 2 pos + METHOD method_59872 dontExpectEntityBetween (Lnet/minecraft/class_1299;Lnet/minecraft/class_243;Lnet/minecraft/class_243;)V + ARG 1 type + ARG 2 pos1 + ARG 3 pos2 diff --git a/mappings/net/minecraft/util/dynamic/CodecCache.mapping b/mappings/net/minecraft/util/dynamic/CodecCache.mapping new file mode 100644 index 0000000000..c70de45e10 --- /dev/null +++ b/mappings/net/minecraft/util/dynamic/CodecCache.mapping @@ -0,0 +1,21 @@ +CLASS net/minecraft/class_9684 net/minecraft/util/dynamic/CodecCache + FIELD field_51504 cache Lcom/google/common/cache/LoadingCache; + METHOD (I)V + ARG 1 size + METHOD method_59856 wrap (Lcom/mojang/serialization/Codec;)Lcom/mojang/serialization/Codec; + ARG 1 codec + CLASS 1 + METHOD load (Ljava/lang/Object;)Ljava/lang/Object; + ARG 1 key + CLASS 2 + METHOD decode (Lcom/mojang/serialization/DynamicOps;Ljava/lang/Object;)Lcom/mojang/serialization/DataResult; + ARG 1 ops + ARG 2 input + METHOD encode (Ljava/lang/Object;Lcom/mojang/serialization/DynamicOps;Ljava/lang/Object;)Lcom/mojang/serialization/DataResult; + ARG 1 value + ARG 2 ops + ARG 3 prefix + CLASS class_9685 Key + METHOD equals (Ljava/lang/Object;)Z + ARG 1 o + METHOD method_59858 load ()Lcom/mojang/serialization/DataResult;