From a62ad058b565065d26beb94bf442b529bb0e2120 Mon Sep 17 00:00:00 2001 From: enbrain <69905075+enbrain@users.noreply.github.com> Date: Tue, 9 Nov 2021 08:34:57 +0900 Subject: [PATCH] Map int/float/height providers (#2813) --- .../ClampedNormalFloatProvider.mapping | 10 ++++++ .../ConstantFloatProvider.mapping | 8 +++++ .../math/floatprovider/FloatProvider.mapping | 6 ++++ .../TrapezoidFloatProvider.mapping | 8 +++++ .../UniformFloatProvider.mapping | 6 ++++ .../BiasedToBottomIntProvider.mapping | 6 ++++ .../intprovider/ClampedIntProvider.mapping | 8 +++++ .../ClampedNormalIntProvider.mapping | 32 +++++++++++++++++++ .../intprovider/ConstantIntProvider.mapping | 2 ++ .../util/math/intprovider/IntProvider.mapping | 6 ++++ .../WeightedListIntProvider.mapping | 4 +++ .../BiasedToBottomHeightProvider.mapping | 6 ++++ .../ConstantHeightProvider.mapping | 8 +++++ .../gen/heightprovider/HeightProvider.mapping | 6 ++++ .../heightprovider/HeightProviderType.mapping | 1 + .../TrapezoidHeightProvider.mapping | 4 +++ .../UniformHeightProvider.mapping | 4 +++ .../VeryBiasedToBottomHeightProvider.mapping | 6 ++++ 18 files changed, 131 insertions(+) diff --git a/mappings/net/minecraft/util/math/floatprovider/ClampedNormalFloatProvider.mapping b/mappings/net/minecraft/util/math/floatprovider/ClampedNormalFloatProvider.mapping index 6ecfab6567..7eaf6d35da 100644 --- a/mappings/net/minecraft/util/math/floatprovider/ClampedNormalFloatProvider.mapping +++ b/mappings/net/minecraft/util/math/floatprovider/ClampedNormalFloatProvider.mapping @@ -14,6 +14,8 @@ CLASS net/minecraft/class_5861 net/minecraft/util/math/floatprovider/ClampedNorm ARG 1 deviation ARG 2 min ARG 3 max + METHOD method_33901 (Lnet/minecraft/class_5861;)Lcom/mojang/serialization/DataResult; + ARG 0 provider METHOD method_33902 (Lcom/mojang/serialization/codecs/RecordCodecBuilder$Instance;)Lcom/mojang/datafixers/kinds/App; ARG 0 instance METHOD method_33903 get (Ljava/util/Random;FFFF)F @@ -22,3 +24,11 @@ CLASS net/minecraft/class_5861 net/minecraft/util/math/floatprovider/ClampedNorm ARG 2 deviation ARG 3 min ARG 4 max + METHOD method_33904 (Lnet/minecraft/class_5861;)Ljava/lang/Float; + ARG 0 provider + METHOD method_33905 (Lnet/minecraft/class_5861;)Ljava/lang/Float; + ARG 0 provider + METHOD method_33906 (Lnet/minecraft/class_5861;)Ljava/lang/Float; + ARG 0 provider + METHOD method_33907 (Lnet/minecraft/class_5861;)Ljava/lang/Float; + ARG 0 provider diff --git a/mappings/net/minecraft/util/math/floatprovider/ConstantFloatProvider.mapping b/mappings/net/minecraft/util/math/floatprovider/ConstantFloatProvider.mapping index 2023af7f1b..3ef663be8f 100644 --- a/mappings/net/minecraft/util/math/floatprovider/ConstantFloatProvider.mapping +++ b/mappings/net/minecraft/util/math/floatprovider/ConstantFloatProvider.mapping @@ -6,6 +6,14 @@ CLASS net/minecraft/class_5862 net/minecraft/util/math/floatprovider/ConstantFlo ARG 1 value METHOD method_33908 create (F)Lnet/minecraft/class_5862; ARG 0 value + METHOD method_33909 (Lnet/minecraft/class_5862;)Lcom/mojang/datafixers/util/Either; + ARG 0 provider + METHOD method_33910 (Lcom/mojang/datafixers/util/Either;)Lnet/minecraft/class_5862; + ARG 0 either METHOD method_33911 (Lcom/mojang/serialization/codecs/RecordCodecBuilder$Instance;)Lcom/mojang/datafixers/kinds/App; ARG 0 instance + METHOD method_33912 (Lnet/minecraft/class_5862;)Lnet/minecraft/class_5862; + ARG 0 provider + METHOD method_33913 (Lnet/minecraft/class_5862;)Ljava/lang/Float; + ARG 0 provider METHOD method_33914 getValue ()F diff --git a/mappings/net/minecraft/util/math/floatprovider/FloatProvider.mapping b/mappings/net/minecraft/util/math/floatprovider/FloatProvider.mapping index 223da3578b..95b7627786 100644 --- a/mappings/net/minecraft/util/math/floatprovider/FloatProvider.mapping +++ b/mappings/net/minecraft/util/math/floatprovider/FloatProvider.mapping @@ -7,7 +7,13 @@ CLASS net/minecraft/class_5863 net/minecraft/util/math/floatprovider/FloatProvid ARG 1 max METHOD method_33917 (FFLnet/minecraft/class_5863;)Lcom/mojang/serialization/DataResult; ARG 2 provider + METHOD method_33918 (Lnet/minecraft/class_5863;)Lcom/mojang/datafixers/util/Either; + ARG 0 provider + METHOD method_33919 (Lcom/mojang/datafixers/util/Either;)Lnet/minecraft/class_5863; + ARG 0 either METHOD method_33920 get (Ljava/util/Random;)F ARG 1 random METHOD method_33921 getMax ()F + METHOD method_33922 (Lnet/minecraft/class_5863;)Lnet/minecraft/class_5863; + ARG 0 provider METHOD method_33923 getType ()Lnet/minecraft/class_5864; diff --git a/mappings/net/minecraft/util/math/floatprovider/TrapezoidFloatProvider.mapping b/mappings/net/minecraft/util/math/floatprovider/TrapezoidFloatProvider.mapping index 523974e329..50ddeb89d2 100644 --- a/mappings/net/minecraft/util/math/floatprovider/TrapezoidFloatProvider.mapping +++ b/mappings/net/minecraft/util/math/floatprovider/TrapezoidFloatProvider.mapping @@ -11,5 +11,13 @@ CLASS net/minecraft/class_5865 net/minecraft/util/math/floatprovider/TrapezoidFl ARG 0 min ARG 1 max ARG 2 plateau + METHOD method_33927 (Lnet/minecraft/class_5865;)Lcom/mojang/serialization/DataResult; + ARG 0 provider METHOD method_33928 (Lcom/mojang/serialization/codecs/RecordCodecBuilder$Instance;)Lcom/mojang/datafixers/kinds/App; ARG 0 instance + METHOD method_33929 (Lnet/minecraft/class_5865;)Ljava/lang/Float; + ARG 0 provider + METHOD method_33930 (Lnet/minecraft/class_5865;)Ljava/lang/Float; + ARG 0 provider + METHOD method_33931 (Lnet/minecraft/class_5865;)Ljava/lang/Float; + ARG 0 provider diff --git a/mappings/net/minecraft/util/math/floatprovider/UniformFloatProvider.mapping b/mappings/net/minecraft/util/math/floatprovider/UniformFloatProvider.mapping index e3038d43eb..a297b71584 100644 --- a/mappings/net/minecraft/util/math/floatprovider/UniformFloatProvider.mapping +++ b/mappings/net/minecraft/util/math/floatprovider/UniformFloatProvider.mapping @@ -5,8 +5,14 @@ CLASS net/minecraft/class_5866 net/minecraft/util/math/floatprovider/UniformFloa METHOD (FF)V ARG 1 min ARG 2 max + METHOD method_33932 (Lnet/minecraft/class_5866;)Lcom/mojang/serialization/DataResult; + ARG 0 provider METHOD method_33933 (Lcom/mojang/serialization/codecs/RecordCodecBuilder$Instance;)Lcom/mojang/datafixers/kinds/App; ARG 0 instance METHOD method_33934 create (FF)Lnet/minecraft/class_5866; ARG 0 min ARG 1 max + METHOD method_33935 (Lnet/minecraft/class_5866;)Ljava/lang/Float; + ARG 0 provider + METHOD method_33936 (Lnet/minecraft/class_5866;)Ljava/lang/Float; + ARG 0 provider diff --git a/mappings/net/minecraft/util/math/intprovider/BiasedToBottomIntProvider.mapping b/mappings/net/minecraft/util/math/intprovider/BiasedToBottomIntProvider.mapping index cbf141f669..c75bb4a572 100644 --- a/mappings/net/minecraft/util/math/intprovider/BiasedToBottomIntProvider.mapping +++ b/mappings/net/minecraft/util/math/intprovider/BiasedToBottomIntProvider.mapping @@ -10,5 +10,11 @@ CLASS net/minecraft/class_6333 net/minecraft/util/math/intprovider/BiasedToBotto COMMENT the minimum value, inclusive ARG 1 max COMMENT the maximum value, inclusive + METHOD method_36250 (Lnet/minecraft/class_6333;)Lcom/mojang/serialization/DataResult; + ARG 0 provider METHOD method_36251 (Lcom/mojang/serialization/codecs/RecordCodecBuilder$Instance;)Lcom/mojang/datafixers/kinds/App; ARG 0 instance + METHOD method_36252 (Lnet/minecraft/class_6333;)Ljava/lang/Integer; + ARG 0 provider + METHOD method_36253 (Lnet/minecraft/class_6333;)Ljava/lang/Integer; + ARG 0 provider diff --git a/mappings/net/minecraft/util/math/intprovider/ClampedIntProvider.mapping b/mappings/net/minecraft/util/math/intprovider/ClampedIntProvider.mapping index 313d4025ec..1a663b76ed 100644 --- a/mappings/net/minecraft/util/math/intprovider/ClampedIntProvider.mapping +++ b/mappings/net/minecraft/util/math/intprovider/ClampedIntProvider.mapping @@ -7,9 +7,17 @@ CLASS net/minecraft/class_6334 net/minecraft/util/math/intprovider/ClampedIntPro ARG 1 source ARG 2 min ARG 3 max + METHOD method_36254 (Lnet/minecraft/class_6334;)Lcom/mojang/serialization/DataResult; + ARG 0 provider METHOD method_36255 create (Lnet/minecraft/class_6017;II)Lnet/minecraft/class_6334; ARG 0 source ARG 1 min ARG 2 max METHOD method_36256 (Lcom/mojang/serialization/codecs/RecordCodecBuilder$Instance;)Lcom/mojang/datafixers/kinds/App; ARG 0 instance + METHOD method_36257 (Lnet/minecraft/class_6334;)Ljava/lang/Integer; + ARG 0 provider + METHOD method_36258 (Lnet/minecraft/class_6334;)Ljava/lang/Integer; + ARG 0 provider + METHOD method_36259 (Lnet/minecraft/class_6334;)Lnet/minecraft/class_6017; + ARG 0 provider diff --git a/mappings/net/minecraft/util/math/intprovider/ClampedNormalIntProvider.mapping b/mappings/net/minecraft/util/math/intprovider/ClampedNormalIntProvider.mapping index b1b917e976..a5c305289e 100644 --- a/mappings/net/minecraft/util/math/intprovider/ClampedNormalIntProvider.mapping +++ b/mappings/net/minecraft/util/math/intprovider/ClampedNormalIntProvider.mapping @@ -1,2 +1,34 @@ CLASS net/minecraft/class_6728 net/minecraft/util/math/intprovider/ClampedNormalIntProvider FIELD field_35352 CODEC Lcom/mojang/serialization/Codec; + FIELD field_35353 mean F + FIELD field_35354 deviation F + FIELD field_35355 min I + FIELD field_35356 max I + METHOD (FFII)V + ARG 1 mean + ARG 2 deviation + ARG 3 min + ARG 4 max + METHOD method_39156 of (FFII)Lnet/minecraft/class_6728; + ARG 0 mean + ARG 1 deviation + ARG 2 min + ARG 3 max + METHOD method_39157 (Lnet/minecraft/class_6728;)Lcom/mojang/serialization/DataResult; + ARG 0 provider + METHOD method_39158 (Lcom/mojang/serialization/codecs/RecordCodecBuilder$Instance;)Lcom/mojang/datafixers/kinds/App; + ARG 0 instance + METHOD method_39159 next (Ljava/util/Random;FFFF)I + ARG 0 random + ARG 1 mean + ARG 2 deviation + ARG 3 min + ARG 4 max + METHOD method_39160 (Lnet/minecraft/class_6728;)Ljava/lang/Integer; + ARG 0 provider + METHOD method_39161 (Lnet/minecraft/class_6728;)Ljava/lang/Integer; + ARG 0 provider + METHOD method_39162 (Lnet/minecraft/class_6728;)Ljava/lang/Float; + ARG 0 provider + METHOD method_39163 (Lnet/minecraft/class_6728;)Ljava/lang/Float; + ARG 0 provider diff --git a/mappings/net/minecraft/util/math/intprovider/ConstantIntProvider.mapping b/mappings/net/minecraft/util/math/intprovider/ConstantIntProvider.mapping index f30a681cc2..5d46468cff 100644 --- a/mappings/net/minecraft/util/math/intprovider/ConstantIntProvider.mapping +++ b/mappings/net/minecraft/util/math/intprovider/ConstantIntProvider.mapping @@ -9,6 +9,8 @@ CLASS net/minecraft/class_6016 net/minecraft/util/math/intprovider/ConstantIntPr ARG 0 value METHOD method_34999 (Lnet/minecraft/class_6016;)Lcom/mojang/datafixers/util/Either; ARG 0 provider + METHOD method_35000 (Lcom/mojang/datafixers/util/Either;)Lnet/minecraft/class_6016; + ARG 0 either METHOD method_35001 (Lcom/mojang/serialization/codecs/RecordCodecBuilder$Instance;)Lcom/mojang/datafixers/kinds/App; ARG 0 instance METHOD method_35002 (Lnet/minecraft/class_6016;)Lnet/minecraft/class_6016; diff --git a/mappings/net/minecraft/util/math/intprovider/IntProvider.mapping b/mappings/net/minecraft/util/math/intprovider/IntProvider.mapping index 47d2b3fe3b..72b42f9014 100644 --- a/mappings/net/minecraft/util/math/intprovider/IntProvider.mapping +++ b/mappings/net/minecraft/util/math/intprovider/IntProvider.mapping @@ -8,8 +8,14 @@ CLASS net/minecraft/class_6017 net/minecraft/util/math/intprovider/IntProvider ARG 1 max METHOD method_35005 (IILnet/minecraft/class_6017;)Lcom/mojang/serialization/DataResult; ARG 2 provider + METHOD method_35006 (Lnet/minecraft/class_6017;)Lcom/mojang/datafixers/util/Either; + ARG 0 provider + METHOD method_35007 (Lcom/mojang/datafixers/util/Either;)Lnet/minecraft/class_6017; + ARG 0 either METHOD method_35008 get (Ljava/util/Random;)I ARG 1 random METHOD method_35009 getMin ()I + METHOD method_35010 (Lnet/minecraft/class_6017;)Lnet/minecraft/class_6017; + ARG 0 provider METHOD method_35011 getMax ()I METHOD method_35012 getType ()Lnet/minecraft/class_6018; diff --git a/mappings/net/minecraft/util/math/intprovider/WeightedListIntProvider.mapping b/mappings/net/minecraft/util/math/intprovider/WeightedListIntProvider.mapping index 37ecdfc732..a479b5013f 100644 --- a/mappings/net/minecraft/util/math/intprovider/WeightedListIntProvider.mapping +++ b/mappings/net/minecraft/util/math/intprovider/WeightedListIntProvider.mapping @@ -5,3 +5,7 @@ CLASS net/minecraft/class_6642 net/minecraft/util/math/intprovider/WeightedListI FIELD field_35038 max I METHOD (Lnet/minecraft/class_6005;)V ARG 1 weightedList + METHOD method_38844 (Lnet/minecraft/class_6642;)Lnet/minecraft/class_6005; + ARG 0 provider + METHOD method_38845 (Lcom/mojang/serialization/codecs/RecordCodecBuilder$Instance;)Lcom/mojang/datafixers/kinds/App; + ARG 0 instance diff --git a/mappings/net/minecraft/world/gen/heightprovider/BiasedToBottomHeightProvider.mapping b/mappings/net/minecraft/world/gen/heightprovider/BiasedToBottomHeightProvider.mapping index 900978091a..0ac6509942 100644 --- a/mappings/net/minecraft/world/gen/heightprovider/BiasedToBottomHeightProvider.mapping +++ b/mappings/net/minecraft/world/gen/heightprovider/BiasedToBottomHeightProvider.mapping @@ -14,3 +14,9 @@ CLASS net/minecraft/class_6120 net/minecraft/world/gen/heightprovider/BiasedToBo ARG 0 minOffset ARG 1 maxOffset ARG 2 inner + METHOD method_35378 (Lnet/minecraft/class_6120;)Ljava/lang/Integer; + ARG 0 provider + METHOD method_35379 (Lnet/minecraft/class_6120;)Lnet/minecraft/class_5843; + ARG 0 provider + METHOD method_35380 (Lnet/minecraft/class_6120;)Lnet/minecraft/class_5843; + ARG 0 provider diff --git a/mappings/net/minecraft/world/gen/heightprovider/ConstantHeightProvider.mapping b/mappings/net/minecraft/world/gen/heightprovider/ConstantHeightProvider.mapping index e6e1e6b601..f6796454ce 100644 --- a/mappings/net/minecraft/world/gen/heightprovider/ConstantHeightProvider.mapping +++ b/mappings/net/minecraft/world/gen/heightprovider/ConstantHeightProvider.mapping @@ -4,8 +4,16 @@ CLASS net/minecraft/class_6121 net/minecraft/world/gen/heightprovider/ConstantHe FIELD field_31538 offset Lnet/minecraft/class_5843; METHOD (Lnet/minecraft/class_5843;)V ARG 1 offset + METHOD method_35381 (Lcom/mojang/datafixers/util/Either;)Lnet/minecraft/class_6121; + ARG 0 either METHOD method_35382 (Lcom/mojang/serialization/codecs/RecordCodecBuilder$Instance;)Lcom/mojang/datafixers/kinds/App; ARG 0 instance METHOD method_35383 create (Lnet/minecraft/class_5843;)Lnet/minecraft/class_6121; ARG 0 offset + METHOD method_35384 (Lnet/minecraft/class_6121;)Lcom/mojang/datafixers/util/Either; + ARG 0 provider METHOD method_35385 getOffset ()Lnet/minecraft/class_5843; + METHOD method_35386 (Lnet/minecraft/class_6121;)Lnet/minecraft/class_6121; + ARG 0 provider + METHOD method_35387 (Lnet/minecraft/class_6121;)Lnet/minecraft/class_5843; + ARG 0 provider diff --git a/mappings/net/minecraft/world/gen/heightprovider/HeightProvider.mapping b/mappings/net/minecraft/world/gen/heightprovider/HeightProvider.mapping index cb4fb7b38e..74f1d67d3d 100644 --- a/mappings/net/minecraft/world/gen/heightprovider/HeightProvider.mapping +++ b/mappings/net/minecraft/world/gen/heightprovider/HeightProvider.mapping @@ -1,6 +1,12 @@ CLASS net/minecraft/class_6122 net/minecraft/world/gen/heightprovider/HeightProvider FIELD field_31540 CODEC Lcom/mojang/serialization/Codec; METHOD method_35388 getType ()Lnet/minecraft/class_6123; + METHOD method_35389 (Lcom/mojang/datafixers/util/Either;)Lnet/minecraft/class_6122; + ARG 0 either + METHOD method_35390 (Lnet/minecraft/class_6122;)Lcom/mojang/datafixers/util/Either; + ARG 0 provider METHOD method_35391 get (Ljava/util/Random;Lnet/minecraft/class_5868;)I ARG 1 random ARG 2 context + METHOD method_35392 (Lnet/minecraft/class_6122;)Lnet/minecraft/class_6122; + ARG 0 provider diff --git a/mappings/net/minecraft/world/gen/heightprovider/HeightProviderType.mapping b/mappings/net/minecraft/world/gen/heightprovider/HeightProviderType.mapping index 220cc7e3a9..082a018811 100644 --- a/mappings/net/minecraft/world/gen/heightprovider/HeightProviderType.mapping +++ b/mappings/net/minecraft/world/gen/heightprovider/HeightProviderType.mapping @@ -1,3 +1,4 @@ CLASS net/minecraft/class_6123 net/minecraft/world/gen/heightprovider/HeightProviderType METHOD method_35394 register (Ljava/lang/String;Lcom/mojang/serialization/Codec;)Lnet/minecraft/class_6123; ARG 0 id + ARG 1 codec diff --git a/mappings/net/minecraft/world/gen/heightprovider/TrapezoidHeightProvider.mapping b/mappings/net/minecraft/world/gen/heightprovider/TrapezoidHeightProvider.mapping index 268447058b..5c32658cb8 100644 --- a/mappings/net/minecraft/world/gen/heightprovider/TrapezoidHeightProvider.mapping +++ b/mappings/net/minecraft/world/gen/heightprovider/TrapezoidHeightProvider.mapping @@ -21,3 +21,7 @@ CLASS net/minecraft/class_6342 net/minecraft/world/gen/heightprovider/TrapezoidH ARG 1 maxOffset COMMENT the maximum offset, inclusive ARG 2 plateau + METHOD method_36310 (Lnet/minecraft/class_6342;)Lnet/minecraft/class_5843; + ARG 0 provider + METHOD method_36311 (Lnet/minecraft/class_6342;)Lnet/minecraft/class_5843; + ARG 0 provider diff --git a/mappings/net/minecraft/world/gen/heightprovider/UniformHeightProvider.mapping b/mappings/net/minecraft/world/gen/heightprovider/UniformHeightProvider.mapping index 1e919cd33c..6bb86b0f1a 100644 --- a/mappings/net/minecraft/world/gen/heightprovider/UniformHeightProvider.mapping +++ b/mappings/net/minecraft/world/gen/heightprovider/UniformHeightProvider.mapping @@ -13,3 +13,7 @@ CLASS net/minecraft/class_6124 net/minecraft/world/gen/heightprovider/UniformHei COMMENT the minimum offset, inclusive ARG 1 maxOffset COMMENT the maximum offset, inclusive + METHOD method_35397 (Lnet/minecraft/class_6124;)Lnet/minecraft/class_5843; + ARG 0 provider + METHOD method_35398 (Lnet/minecraft/class_6124;)Lnet/minecraft/class_5843; + ARG 0 provider diff --git a/mappings/net/minecraft/world/gen/heightprovider/VeryBiasedToBottomHeightProvider.mapping b/mappings/net/minecraft/world/gen/heightprovider/VeryBiasedToBottomHeightProvider.mapping index ea51b457df..107898081c 100644 --- a/mappings/net/minecraft/world/gen/heightprovider/VeryBiasedToBottomHeightProvider.mapping +++ b/mappings/net/minecraft/world/gen/heightprovider/VeryBiasedToBottomHeightProvider.mapping @@ -14,3 +14,9 @@ CLASS net/minecraft/class_6343 net/minecraft/world/gen/heightprovider/VeryBiased ARG 0 minOffset ARG 1 maxOffset ARG 2 inner + METHOD method_36314 (Lnet/minecraft/class_6343;)Ljava/lang/Integer; + ARG 0 provider + METHOD method_36315 (Lnet/minecraft/class_6343;)Lnet/minecraft/class_5843; + ARG 0 provider + METHOD method_36316 (Lnet/minecraft/class_6343;)Lnet/minecraft/class_5843; + ARG 0 provider