From efc6d8104211a91d6df9eef8b1e3e6669dbeaffc Mon Sep 17 00:00:00 2001 From: Shnupbups Date: Fri, 19 Nov 2021 22:08:33 +1100 Subject: [PATCH] Util stuff (#2854) --- .../util/collection/PackedIntegerArray.mapping | 3 +++ .../net/minecraft/util/dynamic/RegistryOps.mapping | 4 ++++ mappings/net/minecraft/util/math/Spline.mapping | 6 ++++++ .../util/math/noise/InterpolatedNoiseSampler.mapping | 12 ++++++++++++ .../util/registry/BuiltinRegistries.mapping | 3 +++ .../util/registry/DynamicRegistryManager.mapping | 3 +++ .../net/minecraft/util/registry/Registry.mapping | 5 +++++ .../net/minecraft/util/shape/ArrayVoxelShape.mapping | 5 +++++ .../net/minecraft/util/shape/BitSetVoxelSet.mapping | 2 +- .../net/minecraft/util/shape/SimplePairList.mapping | 1 + mappings/net/minecraft/util/shape/VoxelShape.mapping | 7 +++++++ mappings/net/minecraft/util/thread/TaskQueue.mapping | 2 ++ 12 files changed, 52 insertions(+), 1 deletion(-) diff --git a/mappings/net/minecraft/util/collection/PackedIntegerArray.mapping b/mappings/net/minecraft/util/collection/PackedIntegerArray.mapping index c0763a586d..e13935116b 100644 --- a/mappings/net/minecraft/util/collection/PackedIntegerArray.mapping +++ b/mappings/net/minecraft/util/collection/PackedIntegerArray.mapping @@ -33,3 +33,6 @@ CLASS net/minecraft/class_3508 net/minecraft/util/collection/PackedIntegerArray ARG 1 index METHOD method_37972 (Lorg/apache/commons/lang3/mutable/MutableInt;I)V ARG 2 value + CLASS class_6685 InvalidLengthException + METHOD (Ljava/lang/String;)V + ARG 1 message diff --git a/mappings/net/minecraft/util/dynamic/RegistryOps.mapping b/mappings/net/minecraft/util/dynamic/RegistryOps.mapping index 24e929ea58..6840688887 100644 --- a/mappings/net/minecraft/util/dynamic/RegistryOps.mapping +++ b/mappings/net/minecraft/util/dynamic/RegistryOps.mapping @@ -41,8 +41,12 @@ CLASS net/minecraft/class_5382 net/minecraft/util/dynamic/RegistryOps METHOD method_31152 getRegistry (Lnet/minecraft/class_5321;)Lcom/mojang/serialization/DataResult; ARG 1 key METHOD method_36574 ofLoaded (Lcom/mojang/serialization/DynamicOps;Lnet/minecraft/class_3300;Lnet/minecraft/class_5455;)Lnet/minecraft/class_5382; + ARG 0 ops + ARG 1 resourceManager ARG 2 registryManager METHOD method_36575 ofLoaded (Lcom/mojang/serialization/DynamicOps;Lnet/minecraft/class_5506;Lnet/minecraft/class_5455;)Lnet/minecraft/class_5382; + ARG 0 ops + ARG 1 entryLoader ARG 2 registryManager CLASS class_5383 ValueHolder FIELD field_25513 values Ljava/util/Map; diff --git a/mappings/net/minecraft/util/math/Spline.mapping b/mappings/net/minecraft/util/math/Spline.mapping index 174f2cea13..ae77a623c0 100644 --- a/mappings/net/minecraft/util/math/Spline.mapping +++ b/mappings/net/minecraft/util/math/Spline.mapping @@ -2,6 +2,10 @@ CLASS net/minecraft/class_6492 net/minecraft/util/math/Spline METHOD method_37918 builder (Lnet/minecraft/class_6501;)Lnet/minecraft/class_6492$class_6493; ARG 0 locationFunction METHOD method_39225 getDebugString ()Ljava/lang/String; + METHOD method_39427 fixedFloatFunction (F)Lnet/minecraft/class_6492; + ARG 0 value + METHOD method_39502 builder (Lnet/minecraft/class_6501;Lnet/minecraft/class_6501;)Lnet/minecraft/class_6492$class_6493; + ARG 0 locationFunction CLASS class_6493 Builder FIELD field_34382 locationFunction Lnet/minecraft/class_6501; FIELD field_34383 locations Lit/unimi/dsi/fastutil/floats/FloatList; @@ -9,6 +13,8 @@ CLASS net/minecraft/class_6492 net/minecraft/util/math/Spline FIELD field_34385 derivatives Lit/unimi/dsi/fastutil/floats/FloatList; METHOD (Lnet/minecraft/class_6501;)V ARG 1 locationFunction + METHOD (Lnet/minecraft/class_6501;Lnet/minecraft/class_6501;)V + ARG 1 locationFunction METHOD method_37923 build ()Lnet/minecraft/class_6492; METHOD method_37924 add (FFF)Lnet/minecraft/class_6492$class_6493; ARG 1 location diff --git a/mappings/net/minecraft/util/math/noise/InterpolatedNoiseSampler.mapping b/mappings/net/minecraft/util/math/noise/InterpolatedNoiseSampler.mapping index 4c707c1e04..aed9c1135a 100644 --- a/mappings/net/minecraft/util/math/noise/InterpolatedNoiseSampler.mapping +++ b/mappings/net/minecraft/util/math/noise/InterpolatedNoiseSampler.mapping @@ -2,11 +2,23 @@ CLASS net/minecraft/class_5822 net/minecraft/util/math/noise/InterpolatedNoiseSa FIELD field_28774 lowerInterpolatedNoise Lnet/minecraft/class_3537; FIELD field_28775 upperInterpolatedNoise Lnet/minecraft/class_3537; FIELD field_28776 interpolationNoise Lnet/minecraft/class_3537; + FIELD field_34752 xzScale D + FIELD field_34753 yScale D + FIELD field_34754 xzMainScale D + FIELD field_34755 yMainScale D + FIELD field_34756 cellWidth I + FIELD field_34757 cellHeight I METHOD (Lnet/minecraft/class_3537;Lnet/minecraft/class_3537;Lnet/minecraft/class_3537;Lnet/minecraft/class_5308;II)V ARG 1 lowerInterpolatedNoise ARG 2 upperInterpolatedNoise ARG 3 interpolationNoise + ARG 4 config + ARG 5 cellWidth + ARG 6 cellHeight METHOD (Lnet/minecraft/class_5819;Lnet/minecraft/class_5308;II)V ARG 1 random + ARG 2 config + ARG 3 cellWidth + ARG 4 cellHeight METHOD method_39117 addDebugInfo (Ljava/lang/StringBuilder;)V ARG 1 info diff --git a/mappings/net/minecraft/util/registry/BuiltinRegistries.mapping b/mappings/net/minecraft/util/registry/BuiltinRegistries.mapping index 3c76b660a1..6ce147a2a9 100644 --- a/mappings/net/minecraft/util/registry/BuiltinRegistries.mapping +++ b/mappings/net/minecraft/util/registry/BuiltinRegistries.mapping @@ -46,6 +46,9 @@ CLASS net/minecraft/class_5458 net/minecraft/util/registry/BuiltinRegistries METHOD method_30565 addRegistry (Lnet/minecraft/class_5321;Ljava/util/function/Supplier;)Lnet/minecraft/class_2378; ARG 0 registryRef ARG 1 defaultValueSupplier + METHOD method_30566 (Lnet/minecraft/class_2960;Ljava/util/function/Supplier;)V + ARG 0 id + ARG 1 supplier METHOD method_39203 add (Lnet/minecraft/class_2378;Lnet/minecraft/class_5321;Ljava/lang/Object;)Ljava/lang/Object; ARG 0 registry ARG 1 key diff --git a/mappings/net/minecraft/util/registry/DynamicRegistryManager.mapping b/mappings/net/minecraft/util/registry/DynamicRegistryManager.mapping index 031a3a1b94..eaaa52ca53 100644 --- a/mappings/net/minecraft/util/registry/DynamicRegistryManager.mapping +++ b/mappings/net/minecraft/util/registry/DynamicRegistryManager.mapping @@ -14,6 +14,8 @@ CLASS net/minecraft/class_5455 net/minecraft/util/registry/DynamicRegistryManage FIELD field_26733 BUILTIN Lnet/minecraft/class_5455$class_5457; METHOD method_30519 load (Lnet/minecraft/class_5455;Lnet/minecraft/class_5382;)V COMMENT Loads a dynamic registry manager from the resource manager's data files. + ARG 0 manager + ARG 1 ops METHOD method_30520 register (Lcom/google/common/collect/ImmutableMap$Builder;Lnet/minecraft/class_5321;Lcom/mojang/serialization/Codec;)V ARG 0 infosBuilder ARG 1 registryRef @@ -33,6 +35,7 @@ CLASS net/minecraft/class_5455 net/minecraft/util/registry/DynamicRegistryManage COMMENT info} within the {@code manager}. Note that the resource manager instance COMMENT is kept within the {@code ops}. ARG 0 ops + ARG 1 manager ARG 2 info METHOD method_30527 getOptionalMutable (Lnet/minecraft/class_5321;)Ljava/util/Optional; COMMENT Retrieves a registry optionally from this manager. diff --git a/mappings/net/minecraft/util/registry/Registry.mapping b/mappings/net/minecraft/util/registry/Registry.mapping index 66bdc4b5cd..21f68677f7 100644 --- a/mappings/net/minecraft/util/registry/Registry.mapping +++ b/mappings/net/minecraft/util/registry/Registry.mapping @@ -214,3 +214,8 @@ CLASS net/minecraft/class_2378 net/minecraft/util/registry/Registry ARG 1 key METHOD method_35842 contains (Lnet/minecraft/class_5321;)Z ARG 1 key + METHOD method_39197 register (Lnet/minecraft/class_2378;Lnet/minecraft/class_5321;Ljava/lang/Object;)Ljava/lang/Object; + ARG 0 registry + ARG 1 key + ARG 2 entry + METHOD method_39673 getCodec ()Lcom/mojang/serialization/Codec; diff --git a/mappings/net/minecraft/util/shape/ArrayVoxelShape.mapping b/mappings/net/minecraft/util/shape/ArrayVoxelShape.mapping index a137411d0e..25b59b5f93 100644 --- a/mappings/net/minecraft/util/shape/ArrayVoxelShape.mapping +++ b/mappings/net/minecraft/util/shape/ArrayVoxelShape.mapping @@ -7,3 +7,8 @@ CLASS net/minecraft/class_245 net/minecraft/util/shape/ArrayVoxelShape ARG 2 xPoints ARG 3 yPoints ARG 4 zPoints + METHOD (Lnet/minecraft/class_251;[D[D[D)V + ARG 1 shape + ARG 2 xPoints + ARG 3 yPoints + ARG 4 zPoints diff --git a/mappings/net/minecraft/util/shape/BitSetVoxelSet.mapping b/mappings/net/minecraft/util/shape/BitSetVoxelSet.mapping index d98c663b71..bfa237d0f7 100644 --- a/mappings/net/minecraft/util/shape/BitSetVoxelSet.mapping +++ b/mappings/net/minecraft/util/shape/BitSetVoxelSet.mapping @@ -30,7 +30,7 @@ CLASS net/minecraft/class_244 net/minecraft/util/shape/BitSetVoxelSet ARG 6 maxX ARG 7 maxY ARG 8 maxZ - METHOD method_31940 (IIIZ)V + METHOD method_31940 set (IIIZ)V ARG 1 x ARG 2 y ARG 3 z diff --git a/mappings/net/minecraft/util/shape/SimplePairList.mapping b/mappings/net/minecraft/util/shape/SimplePairList.mapping index a2032b702e..fd7adf6794 100644 --- a/mappings/net/minecraft/util/shape/SimplePairList.mapping +++ b/mappings/net/minecraft/util/shape/SimplePairList.mapping @@ -2,6 +2,7 @@ CLASS net/minecraft/class_254 net/minecraft/util/shape/SimplePairList FIELD field_1376 minValues [I FIELD field_1377 valueIndices [D FIELD field_1378 maxValues [I + FIELD field_27347 size I METHOD (Lit/unimi/dsi/fastutil/doubles/DoubleList;Lit/unimi/dsi/fastutil/doubles/DoubleList;ZZ)V ARG 1 first ARG 2 second diff --git a/mappings/net/minecraft/util/shape/VoxelShape.mapping b/mappings/net/minecraft/util/shape/VoxelShape.mapping index 34ae6116de..f665e219a0 100644 --- a/mappings/net/minecraft/util/shape/VoxelShape.mapping +++ b/mappings/net/minecraft/util/shape/VoxelShape.mapping @@ -62,3 +62,10 @@ CLASS net/minecraft/class_265 net/minecraft/util/shape/VoxelShape METHOD method_33661 getClosestPointTo (Lnet/minecraft/class_243;)Ljava/util/Optional; COMMENT {@return the closest point in the shape to {@code target}} ARG 1 target + METHOD method_33662 (Lnet/minecraft/class_243;[Lnet/minecraft/class_243;DDDDDD)V + ARG 2 minX + ARG 4 minY + ARG 6 minZ + ARG 8 maxX + ARG 10 maxY + ARG 12 maxZ diff --git a/mappings/net/minecraft/util/thread/TaskQueue.mapping b/mappings/net/minecraft/util/thread/TaskQueue.mapping index 17d0a78d06..3f463ffccd 100644 --- a/mappings/net/minecraft/util/thread/TaskQueue.mapping +++ b/mappings/net/minecraft/util/thread/TaskQueue.mapping @@ -5,6 +5,8 @@ CLASS net/minecraft/class_3847 net/minecraft/util/thread/TaskQueue METHOD method_16911 isEmpty ()Z METHOD method_34706 getSize ()I CLASS class_3848 Prioritized + FIELD field_35032 queue [Ljava/util/Queue; + FIELD field_35033 queueSize Ljava/util/concurrent/atomic/AtomicInteger; METHOD (I)V ARG 1 priorityCount CLASS class_3849 Simple