From a96db03dd07e31f4d431025d39b3040f39a54eea Mon Sep 17 00:00:00 2001 From: frqnny <45723631+frqnny@users.noreply.github.com> Date: Wed, 13 Apr 2022 09:46:45 -0400 Subject: [PATCH] Codec Mappings and some misc stuff (#3077) * Codec Mappings and some misc stuff * Misc Stuff Includes random obvious constants I found * Apply suggestions from code review Co-authored-by: enbrain <69905075+enbrain@users.noreply.github.com> Co-authored-by: apple502j <33279053+apple502j@users.noreply.github.com> Co-authored-by: enbrain <69905075+enbrain@users.noreply.github.com> Co-authored-by: apple502j <33279053+apple502j@users.noreply.github.com> --- .../net/minecraft/structure/pool/SinglePoolElement.mapping | 6 ++++++ mappings/net/minecraft/structure/pool/StructurePool.mapping | 1 + .../minecraft/structure/pool/StructurePoolElement.mapping | 1 + .../structure/processor/StructureProcessorType.mapping | 2 ++ .../util/math/noise/DoublePerlinNoiseSampler.mapping | 3 ++- mappings/net/minecraft/world/biome/Biome.mapping | 2 ++ .../world/gen/densityfunction/DensityFunction.mapping | 2 ++ .../world/gen/densityfunction/DensityFunctionTypes.mapping | 4 +++- 8 files changed, 19 insertions(+), 2 deletions(-) diff --git a/mappings/net/minecraft/structure/pool/SinglePoolElement.mapping b/mappings/net/minecraft/structure/pool/SinglePoolElement.mapping index 0e89568f2b..d61f37a066 100644 --- a/mappings/net/minecraft/structure/pool/SinglePoolElement.mapping +++ b/mappings/net/minecraft/structure/pool/SinglePoolElement.mapping @@ -1,8 +1,11 @@ CLASS net/minecraft/class_3781 net/minecraft/structure/pool/SinglePoolElement FIELD field_16674 processors Lnet/minecraft/class_6880; FIELD field_24015 location Lcom/mojang/datafixers/util/Either; + FIELD field_24951 LOCATION_CODEC Lcom/mojang/serialization/Codec; + FIELD field_24952 CODEC Lcom/mojang/serialization/Codec; METHOD (Lcom/mojang/datafixers/util/Either;Lnet/minecraft/class_6880;Lnet/minecraft/class_3785$class_3786;)V ARG 1 location + ARG 2 processors ARG 3 projection METHOD (Lnet/minecraft/class_3499;)V ARG 1 structure @@ -17,5 +20,8 @@ CLASS net/minecraft/class_3781 net/minecraft/structure/pool/SinglePoolElement ARG 3 keepJigsaws METHOD method_27233 getStructure (Lnet/minecraft/class_3485;)Lnet/minecraft/class_3499; ARG 1 structureManager + METHOD method_28877 encodeLocation (Lcom/mojang/datafixers/util/Either;Lcom/mojang/serialization/DynamicOps;Ljava/lang/Object;)Lcom/mojang/serialization/DataResult; METHOD method_28878 (Lcom/mojang/serialization/codecs/RecordCodecBuilder$Instance;)Lcom/mojang/datafixers/kinds/App; ARG 0 instance + METHOD method_28880 processorsGetter ()Lcom/mojang/serialization/codecs/RecordCodecBuilder; + METHOD method_28882 locationGetter ()Lcom/mojang/serialization/codecs/RecordCodecBuilder; diff --git a/mappings/net/minecraft/structure/pool/StructurePool.mapping b/mappings/net/minecraft/structure/pool/StructurePool.mapping index ee0b62774e..7be9b50d9a 100644 --- a/mappings/net/minecraft/structure/pool/StructurePool.mapping +++ b/mappings/net/minecraft/structure/pool/StructurePool.mapping @@ -7,6 +7,7 @@ CLASS net/minecraft/class_3785 net/minecraft/structure/pool/StructurePool FIELD field_24954 REGISTRY_CODEC Lcom/mojang/serialization/Codec; FIELD field_24955 LOGGER Lorg/slf4j/Logger; FIELD field_25853 CODEC Lcom/mojang/serialization/Codec; + FIELD field_31523 DEFAULT_Y I METHOD (Lnet/minecraft/class_2960;Lnet/minecraft/class_2960;Ljava/util/List;)V ARG 1 id ARG 2 terminatorsId diff --git a/mappings/net/minecraft/structure/pool/StructurePoolElement.mapping b/mappings/net/minecraft/structure/pool/StructurePoolElement.mapping index a5c4a75445..d40d10de67 100644 --- a/mappings/net/minecraft/structure/pool/StructurePoolElement.mapping +++ b/mappings/net/minecraft/structure/pool/StructurePoolElement.mapping @@ -37,6 +37,7 @@ CLASS net/minecraft/class_3784 net/minecraft/structure/pool/StructurePoolElement ARG 6 box METHOD method_16757 getType ()Lnet/minecraft/class_3816; METHOD method_19308 getGroundLevelDelta ()I + METHOD method_28883 projectionGetter ()Lcom/mojang/serialization/codecs/RecordCodecBuilder; METHOD method_30421 ofFeature (Lnet/minecraft/class_6880;)Ljava/util/function/Function; METHOD method_30422 (Lnet/minecraft/class_6880;Lnet/minecraft/class_3785$class_3786;)Lnet/minecraft/class_3776; ARG 1 projection diff --git a/mappings/net/minecraft/structure/processor/StructureProcessorType.mapping b/mappings/net/minecraft/structure/processor/StructureProcessorType.mapping index f09d96a8a3..d407a6d6c2 100644 --- a/mappings/net/minecraft/structure/processor/StructureProcessorType.mapping +++ b/mappings/net/minecraft/structure/processor/StructureProcessorType.mapping @@ -1,6 +1,8 @@ CLASS net/minecraft/class_3828 net/minecraft/structure/processor/StructureProcessorType FIELD field_25013 CODEC Lcom/mojang/serialization/Codec; + FIELD field_25876 PROCESSORS_CODEC Lcom/mojang/serialization/Codec; FIELD field_25877 REGISTRY_CODEC Lcom/mojang/serialization/Codec; + FIELD field_26663 LIST_CODEC Lcom/mojang/serialization/Codec; METHOD method_16822 register (Ljava/lang/String;Lcom/mojang/serialization/Codec;)Lnet/minecraft/class_3828; ARG 0 id ARG 1 codec diff --git a/mappings/net/minecraft/util/math/noise/DoublePerlinNoiseSampler.mapping b/mappings/net/minecraft/util/math/noise/DoublePerlinNoiseSampler.mapping index 83bed447d7..e4689ef10b 100644 --- a/mappings/net/minecraft/util/math/noise/DoublePerlinNoiseSampler.mapping +++ b/mappings/net/minecraft/util/math/noise/DoublePerlinNoiseSampler.mapping @@ -27,7 +27,8 @@ CLASS net/minecraft/class_5216 net/minecraft/util/math/noise/DoublePerlinNoiseSa CLASS class_5487 NoiseParameters FIELD comp_516 firstOctave I FIELD comp_517 amplitudes Lit/unimi/dsi/fastutil/doubles/DoubleList; - FIELD field_26438 CODEC Lcom/mojang/serialization/Codec; + FIELD field_26438 REGISTRY_ENTRY_CODEC Lcom/mojang/serialization/Codec; + FIELD field_35424 CODEC Lcom/mojang/serialization/Codec; METHOD (ID[D)V ARG 1 firstOctave ARG 2 firstAmplitude diff --git a/mappings/net/minecraft/world/biome/Biome.mapping b/mappings/net/minecraft/world/biome/Biome.mapping index 28031a8ebd..aec5c4c228 100644 --- a/mappings/net/minecraft/world/biome/Biome.mapping +++ b/mappings/net/minecraft/world/biome/Biome.mapping @@ -6,8 +6,10 @@ CLASS net/minecraft/class_1959 net/minecraft/world/biome/Biome FIELD field_26392 FROZEN_OCEAN_NOISE Lnet/minecraft/class_3543; FIELD field_26393 weather Lnet/minecraft/class_1959$class_5482; FIELD field_26395 spawnSettings Lnet/minecraft/class_5483; + FIELD field_26633 NETWORK_CODEC Lcom/mojang/serialization/Codec; FIELD field_26635 generationSettings Lnet/minecraft/class_5485; FIELD field_26750 REGISTRY_ENTRY_LIST_CODEC Lcom/mojang/serialization/Codec; + FIELD field_30978 MAX_TEMPERATURE_CACHE_SIZE I FIELD field_9324 FOLIAGE_NOISE Lnet/minecraft/class_3543; FIELD field_9335 TEMPERATURE_NOISE Lnet/minecraft/class_3543; METHOD (Lnet/minecraft/class_1959$class_5482;Lnet/minecraft/class_4763;Lnet/minecraft/class_5485;Lnet/minecraft/class_5483;)V diff --git a/mappings/net/minecraft/world/gen/densityfunction/DensityFunction.mapping b/mappings/net/minecraft/world/gen/densityfunction/DensityFunction.mapping index dae9f63c35..26e09b8bf4 100644 --- a/mappings/net/minecraft/world/gen/densityfunction/DensityFunction.mapping +++ b/mappings/net/minecraft/world/gen/densityfunction/DensityFunction.mapping @@ -1,5 +1,7 @@ CLASS net/minecraft/class_6910 net/minecraft/world/gen/densityfunction/DensityFunction + FIELD field_37057 CODEC Lcom/mojang/serialization/Codec; FIELD field_37058 REGISTRY_ENTRY_CODEC Lcom/mojang/serialization/Codec; + FIELD field_37059 FUNCTION_CODEC Lcom/mojang/serialization/Codec; METHOD method_40464 sample (Lnet/minecraft/class_6910$class_6912;)D ARG 1 pos METHOD method_40468 clamp (DD)Lnet/minecraft/class_6910; diff --git a/mappings/net/minecraft/world/gen/densityfunction/DensityFunctionTypes.mapping b/mappings/net/minecraft/world/gen/densityfunction/DensityFunctionTypes.mapping index a3fbffd664..6a680fd0dd 100644 --- a/mappings/net/minecraft/world/gen/densityfunction/DensityFunctionTypes.mapping +++ b/mappings/net/minecraft/world/gen/densityfunction/DensityFunctionTypes.mapping @@ -1,5 +1,6 @@ CLASS net/minecraft/class_6916 net/minecraft/world/gen/densityfunction/DensityFunctionTypes - FIELD field_37062 CODEC Lcom/mojang/serialization/Codec; + FIELD field_37061 CODEC Lcom/mojang/serialization/Codec; + FIELD field_37062 DYNAMIC_RANGE Lcom/mojang/serialization/Codec; FIELD field_37063 CONSTANT_RANGE Lcom/mojang/serialization/Codec; METHOD method_40479 zero ()Lnet/minecraft/class_6910; METHOD method_40480 constant (D)Lnet/minecraft/class_6910; @@ -92,6 +93,7 @@ CLASS net/minecraft/class_6916 net/minecraft/world/gen/densityfunction/DensityFu FIELD field_37091 CODEC Lnet/minecraft/class_7243; CLASS class_6932 METHOD method_40520 apply (D)D + ARG 1 density CLASS class_6933 RangeChoice FIELD field_37093 CODEC Lnet/minecraft/class_7243; CLASS class_6934 Shift