From 8960bd3017ff372a695dbefc8df2f3e5344c26ab Mon Sep 17 00:00:00 2001 From: apple502j <33279053+apple502j@users.noreply.github.com> Date: Wed, 30 Mar 2022 19:46:43 +0900 Subject: [PATCH] 22w12a datafixer and codecs (#3063) --- .../net/minecraft/datafixer/Schemas.mapping | 4 ++ .../datafixer/schema/Schema3081.mapping | 7 +++ .../datafixer/schema/Schema3082.mapping | 4 ++ .../util/dynamic/CodecHolder.mapping | 5 +++ .../net/minecraft/util/dynamic/Codecs.mapping | 43 +++++++++++++++++++ 5 files changed, 63 insertions(+) create mode 100644 mappings/net/minecraft/util/dynamic/CodecHolder.mapping diff --git a/mappings/net/minecraft/datafixer/Schemas.mapping b/mappings/net/minecraft/datafixer/Schemas.mapping index 03831664ba..d2cf6a77d6 100644 --- a/mappings/net/minecraft/datafixer/Schemas.mapping +++ b/mappings/net/minecraft/datafixer/Schemas.mapping @@ -9,5 +9,9 @@ CLASS net/minecraft/class_3551 net/minecraft/datafixer/Schemas METHOD method_30068 replacing (Ljava/lang/String;Ljava/lang/String;)Ljava/util/function/UnaryOperator; ARG 0 old ARG 1 current + METHOD method_30069 (Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;)Ljava/lang/String; + ARG 2 string METHOD method_30070 replacing (Ljava/util/Map;)Ljava/util/function/UnaryOperator; ARG 0 replacements + METHOD method_30071 (Ljava/util/Map;Ljava/lang/String;)Ljava/lang/String; + ARG 1 string diff --git a/mappings/net/minecraft/datafixer/schema/Schema3081.mapping b/mappings/net/minecraft/datafixer/schema/Schema3081.mapping index 07a626f7be..73733f718d 100644 --- a/mappings/net/minecraft/datafixer/schema/Schema3081.mapping +++ b/mappings/net/minecraft/datafixer/schema/Schema3081.mapping @@ -1 +1,8 @@ CLASS net/minecraft/class_7245 net/minecraft/datafixer/schema/Schema3081 + METHOD method_42124 register (Lcom/mojang/datafixers/schemas/Schema;Ljava/util/Map;Ljava/lang/String;)V + ARG 0 schema + ARG 1 map + ARG 2 id + METHOD registerEntities (Lcom/mojang/datafixers/schemas/Schema;)Ljava/util/Map; + ARG 1 schema + \ No newline at end of file diff --git a/mappings/net/minecraft/datafixer/schema/Schema3082.mapping b/mappings/net/minecraft/datafixer/schema/Schema3082.mapping index a4d1a18436..5b011af159 100644 --- a/mappings/net/minecraft/datafixer/schema/Schema3082.mapping +++ b/mappings/net/minecraft/datafixer/schema/Schema3082.mapping @@ -1 +1,5 @@ CLASS net/minecraft/class_7246 net/minecraft/datafixer/schema/Schema3082 + METHOD method_42125 (Lcom/mojang/datafixers/schemas/Schema;Ljava/lang/String;)Lcom/mojang/datafixers/types/templates/TypeTemplate; + ARG 1 string + METHOD registerEntities (Lcom/mojang/datafixers/schemas/Schema;)Ljava/util/Map; + ARG 1 schema diff --git a/mappings/net/minecraft/util/dynamic/CodecHolder.mapping b/mappings/net/minecraft/util/dynamic/CodecHolder.mapping new file mode 100644 index 0000000000..e0d59e902a --- /dev/null +++ b/mappings/net/minecraft/util/dynamic/CodecHolder.mapping @@ -0,0 +1,5 @@ +CLASS net/minecraft/class_7243 net/minecraft/util/dynamic/CodecHolder + METHOD method_42115 of (Lcom/mojang/serialization/Codec;)Lnet/minecraft/class_7243; + ARG 0 codec + METHOD method_42116 of (Lcom/mojang/serialization/MapCodec;)Lnet/minecraft/class_7243; + ARG 0 mapCodec diff --git a/mappings/net/minecraft/util/dynamic/Codecs.mapping b/mappings/net/minecraft/util/dynamic/Codecs.mapping index 8d4acaac83..3fdded543f 100644 --- a/mappings/net/minecraft/util/dynamic/Codecs.mapping +++ b/mappings/net/minecraft/util/dynamic/Codecs.mapping @@ -50,6 +50,10 @@ CLASS net/minecraft/class_5699 net/minecraft/util/dynamic/Codecs ARG 0 min ARG 1 max ARG 2 messageFactory + METHOD method_37929 (Lcom/mojang/datafixers/util/Either;)Ljava/lang/Object; + ARG 0 either + METHOD method_37930 (Lcom/mojang/serialization/Codec;Ljava/lang/String;Ljava/lang/String;Lcom/mojang/serialization/codecs/RecordCodecBuilder$Instance;)Lcom/mojang/datafixers/kinds/App; + ARG 3 instance METHOD method_37931 createCodecForPairObject (Lcom/mojang/serialization/Codec;Ljava/lang/String;Ljava/lang/String;Ljava/util/function/BiFunction;Ljava/util/function/Function;Ljava/util/function/Function;)Lcom/mojang/serialization/Codec; ARG 0 codec ARG 1 leftFieldName @@ -61,15 +65,45 @@ CLASS net/minecraft/class_5699 net/minecraft/util/dynamic/Codecs ARG 0 v METHOD method_37933 (Ljava/lang/Number;Ljava/lang/Number;Ljava/util/function/Function;Ljava/lang/Number;)Lcom/mojang/serialization/DataResult; ARG 3 value + METHOD method_37934 (Ljava/lang/Object;)Ljava/lang/Object; + ARG 0 object + METHOD method_37935 (Ljava/util/function/BiFunction;Lcom/mojang/datafixers/util/Either;)Lcom/mojang/serialization/DataResult; + ARG 1 either + METHOD method_37936 (Ljava/util/function/BiFunction;Lcom/mojang/datafixers/util/Pair;)Lcom/mojang/serialization/DataResult; + ARG 1 pair + METHOD method_37937 (Ljava/util/function/BiFunction;Ljava/lang/Object;)Lcom/mojang/serialization/DataResult; + ARG 1 object + METHOD method_37938 (Ljava/util/function/BiFunction;Ljava/util/List;)Lcom/mojang/serialization/DataResult; + ARG 1 list + METHOD method_37939 (Ljava/util/function/Function;Ljava/util/function/Function;Ljava/lang/Object;)Lcom/mojang/datafixers/util/Either; + ARG 2 pair METHOD method_37940 createFloatRangeChecker (Ljava/lang/Number;Ljava/lang/Number;Ljava/util/function/Function;)Ljava/util/function/Function; ARG 0 min ARG 1 max ARG 2 messageFactory + METHOD method_37941 (Ljava/lang/Object;)Ljava/lang/Object; + ARG 0 object + METHOD method_37942 (Ljava/util/function/BiFunction;Ljava/util/List;)Lcom/mojang/serialization/DataResult; + ARG 1 list + METHOD method_37943 (Ljava/util/function/Function;Ljava/util/function/Function;Ljava/lang/Object;)Lcom/mojang/datafixers/util/Pair; + ARG 2 pair + METHOD method_37944 (Ljava/util/function/Function;Ljava/util/function/Function;Ljava/lang/Object;)Ljava/util/List; + ARG 2 pair METHOD method_39028 orElsePartial (Ljava/lang/Object;)Lcom/mojang/serialization/Codec$ResultFunction; + ARG 0 object METHOD method_39240 createLazy (Ljava/util/function/Supplier;)Lcom/mojang/serialization/Codec; ARG 0 supplier METHOD method_39504 withLifecycle (Lcom/mojang/serialization/Codec;Ljava/util/function/Function;Ljava/util/function/Function;)Lcom/mojang/serialization/Codec; ARG 0 originalCodec + ARG 1 entryLifecycleGetter + ARG 2 lifecycleGetter + METHOD method_39506 (Ljava/util/function/Function;Ljava/lang/Object;)Lcom/mojang/serialization/DataResult; + ARG 1 element + METHOD method_39507 (Ljava/util/function/Function;Ljava/lang/String;)Lcom/mojang/serialization/DataResult; + ARG 1 id + METHOD method_39508 idChecked (Ljava/util/function/Function;Ljava/util/function/Function;)Lcom/mojang/serialization/Codec; + ARG 0 elementToId + ARG 1 idToElement METHOD method_39509 (Ljava/util/function/IntFunction;Ljava/lang/Integer;)Lcom/mojang/serialization/DataResult; ARG 1 rawId METHOD method_39510 (Ljava/util/function/ToIntFunction;ILjava/lang/Object;)Lcom/mojang/serialization/DataResult; @@ -94,6 +128,8 @@ CLASS net/minecraft/class_5699 net/minecraft/util/dynamic/Codecs ARG 0 typeGetter METHOD method_41302 (Ljava/lang/String;)Lcom/mojang/serialization/DataResult; ARG 0 pattern + METHOD method_42114 exceptionCatching (Lcom/mojang/serialization/Codec;)Lcom/mojang/serialization/Codec; + ARG 0 codec CLASS 1 METHOD apply (Lcom/mojang/serialization/DynamicOps;Ljava/lang/Object;Lcom/mojang/serialization/DataResult;)Lcom/mojang/serialization/DataResult; ARG 1 ops @@ -122,6 +158,10 @@ CLASS net/minecraft/class_5699 net/minecraft/util/dynamic/Codecs ARG 3 result METHOD method_39515 (Lcom/mojang/serialization/DataResult;Ljava/util/function/Function;Lcom/mojang/datafixers/util/Pair;)Lcom/mojang/serialization/DataResult; ARG 2 pair + CLASS 4 + METHOD decode (Lcom/mojang/serialization/DynamicOps;Ljava/lang/Object;)Lcom/mojang/serialization/DataResult; + ARG 1 ops + ARG 2 input CLASS class_5839 Xor COMMENT An xor codec that only permits exactly one of the two data choices to be COMMENT present. @@ -167,6 +207,9 @@ CLASS net/minecraft/class_5699 net/minecraft/util/dynamic/Codecs ARG 1 o METHOD method_37946 (Lcom/mojang/datafixers/util/Pair;)Lcom/mojang/datafixers/util/Pair; ARG 0 pair + METHOD method_37947 (Lcom/mojang/datafixers/util/Pair;Lcom/mojang/datafixers/util/Pair;)Lcom/mojang/datafixers/util/Pair; + ARG 0 pair + ARG 1 pair2 METHOD method_37948 (Lcom/mojang/serialization/DynamicOps;Ljava/lang/Object;Ljava/lang/Object;)Lcom/mojang/serialization/DataResult; ARG 3 right METHOD method_37949 (Lcom/mojang/datafixers/util/Pair;)Lcom/mojang/datafixers/util/Pair;