From 7c676d1aae0886d698314ce074c5970b969d9c25 Mon Sep 17 00:00:00 2001 From: Shnupbups Date: Sat, 30 Nov 2024 05:53:45 +1100 Subject: [PATCH] 1.21.4-rc3 stuff (#4062) --- mappings/net/minecraft/client/util/Window.mapping | 2 ++ mappings/net/minecraft/datafixer/Schemas.mapping | 12 ++++++++++++ .../datafixer/fix/EntityAttributeBaseFix.mapping | 15 +++++++++++++++ mappings/net/minecraft/util/Util.mapping | 1 + .../world/PersistentStateManager.mapping | 3 +++ 5 files changed, 33 insertions(+) create mode 100644 mappings/net/minecraft/datafixer/fix/EntityAttributeBaseFix.mapping diff --git a/mappings/net/minecraft/client/util/Window.mapping b/mappings/net/minecraft/client/util/Window.mapping index c8e136e42b..4e5a2e3565 100644 --- a/mappings/net/minecraft/client/util/Window.mapping +++ b/mappings/net/minecraft/client/util/Window.mapping @@ -24,6 +24,7 @@ CLASS net/minecraft/class_1041 net/minecraft/client/util/Window FIELD field_5197 height I FIELD field_5198 y I FIELD field_52735 minimized Z + FIELD field_55579 zeroWidthOrHeight Z METHOD (Lnet/minecraft/class_3678;Lnet/minecraft/class_323;Lnet/minecraft/class_543;Ljava/lang/String;Ljava/lang/String;)V ARG 1 eventHandler ARG 2 monitorTracker @@ -114,4 +115,5 @@ CLASS net/minecraft/class_1041 net/minecraft/client/util/Window ARG 1 window ARG 3 minimized METHOD method_61946 isMinimized ()Z + METHOD method_65966 hasZeroWidthOrHeight ()Z CLASS class_4716 GlErroredException diff --git a/mappings/net/minecraft/datafixer/Schemas.mapping b/mappings/net/minecraft/datafixer/Schemas.mapping index 12858a27da..0a9e6a7ecd 100644 --- a/mappings/net/minecraft/datafixer/Schemas.mapping +++ b/mappings/net/minecraft/datafixer/Schemas.mapping @@ -31,3 +31,15 @@ CLASS net/minecraft/class_3551 net/minecraft/datafixer/Schemas ARG 1 string METHOD method_60487 optimize (Ljava/util/Set;)Ljava/util/concurrent/CompletableFuture; ARG 0 requiredTypes + METHOD method_65952 (D)D + ARG 0 followRange + METHOD method_65953 (D)D + ARG 0 followRange + METHOD method_65954 (D)D + ARG 0 followRange + METHOD method_65955 (D)D + ARG 0 followRange + METHOD method_65956 (D)D + ARG 0 followRange + METHOD method_65957 (D)D + ARG 0 followRange diff --git a/mappings/net/minecraft/datafixer/fix/EntityAttributeBaseFix.mapping b/mappings/net/minecraft/datafixer/fix/EntityAttributeBaseFix.mapping new file mode 100644 index 0000000000..981dbb71d3 --- /dev/null +++ b/mappings/net/minecraft/datafixer/fix/EntityAttributeBaseFix.mapping @@ -0,0 +1,15 @@ +CLASS net/minecraft/class_10554 net/minecraft/datafixer/fix/EntityAttributeBaseFix + FIELD field_55577 attributeId Ljava/lang/String; + FIELD field_55578 fixOperator Ljava/util/function/DoubleUnaryOperator; + METHOD (Lcom/mojang/datafixers/schemas/Schema;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/util/function/DoubleUnaryOperator;)V + ARG 1 outputSchema + ARG 2 name + ARG 3 entityId + ARG 4 attributeId + ARG 5 fixOperator + METHOD method_65958 fix (Lcom/mojang/serialization/Dynamic;)Lcom/mojang/serialization/Dynamic; + ARG 1 dynamic + METHOD method_65959 (Lcom/mojang/serialization/Dynamic;Lcom/mojang/serialization/Dynamic;)Lcom/mojang/serialization/Dynamic; + ARG 2 attributesDynamic + METHOD method_65960 (Lcom/mojang/serialization/Dynamic;)Lcom/mojang/serialization/Dynamic; + ARG 1 attributeDynamic diff --git a/mappings/net/minecraft/util/Util.mapping b/mappings/net/minecraft/util/Util.mapping index b0d4b6ee98..987af8ed52 100644 --- a/mappings/net/minecraft/util/Util.mapping +++ b/mappings/net/minecraft/util/Util.mapping @@ -494,6 +494,7 @@ CLASS net/minecraft/class_156 net/minecraft/util/Util COMMENT COMMENT @see #getMeasuringTimeMs COMMENT @see #getMeasuringTimeNano + METHOD method_65951 getAvailableBackgroundThreads ()I METHOD method_660 next (Ljava/lang/Iterable;Ljava/lang/Object;)Ljava/lang/Object; COMMENT {@return the item succeeding {@code object} in {@code iterable}} COMMENT diff --git a/mappings/net/minecraft/world/PersistentStateManager.mapping b/mappings/net/minecraft/world/PersistentStateManager.mapping index d8413532a3..90ff90dbc0 100644 --- a/mappings/net/minecraft/world/PersistentStateManager.mapping +++ b/mappings/net/minecraft/world/PersistentStateManager.mapping @@ -42,3 +42,6 @@ CLASS net/minecraft/class_26 net/minecraft/world/PersistentStateManager ARG 2 id ARG 3 state METHOD method_61881 collectStatesToSave ()Ljava/util/Map; + METHOD method_65963 save (Ljava/nio/file/Path;Lnet/minecraft/class_2487;)V + ARG 0 path + ARG 1 nbt