diff --git a/mappings/net/minecraft/entity/LivingEntity.mapping b/mappings/net/minecraft/entity/LivingEntity.mapping index 42f8af4251..830e9ce3ff 100644 --- a/mappings/net/minecraft/entity/LivingEntity.mapping +++ b/mappings/net/minecraft/entity/LivingEntity.mapping @@ -144,6 +144,7 @@ CLASS net/minecraft/class_1309 net/minecraft/entity/LivingEntity METHOD method_21753 getStingerCount ()I METHOD method_21755 setStingerCount (I)V ARG 1 stingerCount + METHOD method_23667 swingHand (Lnet/minecraft/class_1268;Z)V METHOD method_5973 canTarget (Lnet/minecraft/class_1299;)Z ARG 1 type METHOD method_5989 getLootTable ()Lnet/minecraft/class_2960; diff --git a/mappings/net/minecraft/util/ActionResult.mapping b/mappings/net/minecraft/util/ActionResult.mapping index f87a9dc265..922c9f1916 100644 --- a/mappings/net/minecraft/util/ActionResult.mapping +++ b/mappings/net/minecraft/util/ActionResult.mapping @@ -1 +1,3 @@ CLASS net/minecraft/class_1269 net/minecraft/util/ActionResult + METHOD method_23665 isAccepted ()Z + METHOD method_23666 shouldSwingHand ()Z diff --git a/mappings/net/minecraft/util/FileNameUtil.mapping b/mappings/net/minecraft/util/FileNameUtil.mapping index acac05950f..ae32f45b83 100644 --- a/mappings/net/minecraft/util/FileNameUtil.mapping +++ b/mappings/net/minecraft/util/FileNameUtil.mapping @@ -1,5 +1,6 @@ CLASS net/minecraft/class_4239 net/minecraft/util/FileNameUtil FIELD field_18955 RESERVED_WINDOWS_NAMES Ljava/util/regex/Pattern; + FIELD field_18956 FILE_NAME_WITH_COUNT Ljava/util/regex/Pattern; METHOD method_19773 getNextUniqueName (Ljava/nio/file/Path;Ljava/lang/String;Ljava/lang/String;)Ljava/lang/String; ARG 0 path ARG 1 name diff --git a/mappings/net/minecraft/util/JsonHelper.mapping b/mappings/net/minecraft/util/JsonHelper.mapping index c53d7fd903..133fba5039 100644 --- a/mappings/net/minecraft/util/JsonHelper.mapping +++ b/mappings/net/minecraft/util/JsonHelper.mapping @@ -142,3 +142,6 @@ CLASS net/minecraft/class_3518 net/minecraft/util/JsonHelper METHOD method_15298 deserialize (Ljava/lang/String;Z)Lcom/google/gson/JsonObject; ARG 0 content ARG 1 lenient + METHOD method_22449 getLong (Lcom/google/gson/JsonObject;Ljava/lang/String;)J + ARG 0 object + ARG 1 name diff --git a/mappings/net/minecraft/util/LowercaseEnumTypeAdapterFactory.mapping b/mappings/net/minecraft/util/LowercaseEnumTypeAdapterFactory.mapping index ea2414effb..1d10dd94f1 100644 --- a/mappings/net/minecraft/util/LowercaseEnumTypeAdapterFactory.mapping +++ b/mappings/net/minecraft/util/LowercaseEnumTypeAdapterFactory.mapping @@ -1,3 +1,3 @@ CLASS net/minecraft/class_3530 net/minecraft/util/LowercaseEnumTypeAdapterFactory - METHOD method_15334 toString (Ljava/lang/Object;)Ljava/lang/String; + METHOD method_15334 getKey (Ljava/lang/Object;)Ljava/lang/String; ARG 1 o diff --git a/mappings/net/minecraft/util/Pair.mapping b/mappings/net/minecraft/util/Pair.mapping index 9bc8f2ae1c..c58d85dbf9 100644 --- a/mappings/net/minecraft/util/Pair.mapping +++ b/mappings/net/minecraft/util/Pair.mapping @@ -1,4 +1,6 @@ CLASS net/minecraft/class_3545 net/minecraft/util/Pair + FIELD field_15772 left Ljava/lang/Object; + FIELD field_15773 right Ljava/lang/Object; METHOD (Ljava/lang/Object;Ljava/lang/Object;)V ARG 1 left ARG 2 right diff --git a/mappings/net/minecraft/util/TaskPriority.mapping b/mappings/net/minecraft/util/TaskPriority.mapping index 5a34390277..b317a86572 100644 --- a/mappings/net/minecraft/util/TaskPriority.mapping +++ b/mappings/net/minecraft/util/TaskPriority.mapping @@ -1,7 +1,7 @@ CLASS net/minecraft/class_1953 net/minecraft/util/TaskPriority - FIELD field_9308 priorityIndex I + FIELD field_9308 index I METHOD (Ljava/lang/String;II)V - ARG 3 priorityIndex - METHOD method_8680 getByIndex (I)Lnet/minecraft/class_1953; - ARG 0 priorityIndex - METHOD method_8681 getPriorityIndex ()I + ARG 3 index + METHOD method_8680 byIndex (I)Lnet/minecraft/class_1953; + ARG 0 index + METHOD method_8681 getIndex ()I diff --git a/mappings/net/minecraft/util/ThreadExecutor.mapping b/mappings/net/minecraft/util/ThreadExecutor.mapping index 0ee8ad2243..c8ba5c9929 100644 --- a/mappings/net/minecraft/util/ThreadExecutor.mapping +++ b/mappings/net/minecraft/util/ThreadExecutor.mapping @@ -1,5 +1,6 @@ CLASS net/minecraft/class_1255 net/minecraft/util/ThreadExecutor FIELD field_18318 name Ljava/lang/String; + FIELD field_18319 executionsInProgress I FIELD field_5750 taskQueue Ljava/util/Queue; FIELD field_5751 LOGGER Lorg/apache/logging/log4j/Logger; METHOD (Ljava/lang/String;)V @@ -17,6 +18,7 @@ CLASS net/minecraft/class_1255 net/minecraft/util/ThreadExecutor ARG 1 task METHOD method_19537 executeSync (Ljava/lang/Runnable;)V ARG 1 runnable + METHOD method_20493 executeFuture (Ljava/lang/Runnable;)Ljava/util/concurrent/CompletableFuture; METHOD method_20813 waitForTasks ()V METHOD method_21684 getTaskQueueSize ()I METHOD method_3777 getThread ()Ljava/lang/Thread; diff --git a/mappings/net/minecraft/util/TypedActionResult.mapping b/mappings/net/minecraft/util/TypedActionResult.mapping index 8ed97d7565..6d4562a084 100644 --- a/mappings/net/minecraft/util/TypedActionResult.mapping +++ b/mappings/net/minecraft/util/TypedActionResult.mapping @@ -4,9 +4,9 @@ CLASS net/minecraft/class_1271 net/minecraft/util/TypedActionResult METHOD (Lnet/minecraft/class_1269;Ljava/lang/Object;)V ARG 1 result ARG 2 value - METHOD method_22427 successWithSwing (Ljava/lang/Object;)Lnet/minecraft/class_1271; + METHOD method_22427 success (Ljava/lang/Object;)Lnet/minecraft/class_1271; ARG 0 data - METHOD method_22428 successWithoutSwing (Ljava/lang/Object;)Lnet/minecraft/class_1271; + METHOD method_22428 consume (Ljava/lang/Object;)Lnet/minecraft/class_1271; ARG 0 data METHOD method_22430 pass (Ljava/lang/Object;)Lnet/minecraft/class_1271; ARG 0 data diff --git a/mappings/net/minecraft/util/WeightedList.mapping b/mappings/net/minecraft/util/WeightedList.mapping index ed6cb62c67..718dc104d4 100644 --- a/mappings/net/minecraft/util/WeightedList.mapping +++ b/mappings/net/minecraft/util/WeightedList.mapping @@ -1,14 +1,28 @@ CLASS net/minecraft/class_4131 net/minecraft/util/WeightedList CLASS class_4132 Entry + FIELD field_18400 item Ljava/lang/Object; FIELD field_18401 weight I FIELD field_18402 shuffledOrder D + METHOD (Lnet/minecraft/class_4131;Ljava/lang/Object;I)V + ARG 2 item + ARG 3 weight METHOD method_19033 getShuffledOrder ()D METHOD method_19034 setShuffledOrder (F)V ARG 1 random METHOD method_19035 getElement ()Ljava/lang/Object; + METHOD method_23341 getWeight ()I FIELD field_18397 entries Ljava/util/List; FIELD field_18398 random Ljava/util/Random; METHOD method_19029 shuffle ()Lnet/minecraft/class_4131; METHOD method_19031 add (Ljava/lang/Object;I)Lnet/minecraft/class_4131; + ARG 1 item + ARG 2 weight METHOD method_19032 stream ()Ljava/util/stream/Stream; + METHOD method_23330 serialize (Lcom/mojang/datafixers/types/DynamicOps;Ljava/util/function/Function;)Ljava/lang/Object; + ARG 1 ops + ARG 2 entrySerializer + METHOD method_23333 shuffle (Ljava/util/Random;)Lnet/minecraft/class_4131; + ARG 1 random METHOD method_23337 pickRandom (Ljava/util/Random;)Ljava/lang/Object; + ARG 1 random + METHOD method_23338 streamEntries ()Ljava/util/stream/Stream; diff --git a/mappings/net/minecraft/util/math/AxisCycleDirection.mapping b/mappings/net/minecraft/util/math/AxisCycleDirection.mapping index 249f30dbf2..93e383fba1 100644 --- a/mappings/net/minecraft/util/math/AxisCycleDirection.mapping +++ b/mappings/net/minecraft/util/math/AxisCycleDirection.mapping @@ -3,6 +3,9 @@ CLASS net/minecraft/class_2335 net/minecraft/util/math/AxisCycleDirection FIELD field_10961 AXES [Lnet/minecraft/class_2350$class_2351; METHOD method_10055 opposite ()Lnet/minecraft/class_2335; METHOD method_10056 choose (IIILnet/minecraft/class_2350$class_2351;)I + ARG 1 x + ARG 2 y + ARG 3 z ARG 4 axis METHOD method_10057 between (Lnet/minecraft/class_2350$class_2351;Lnet/minecraft/class_2350$class_2351;)Lnet/minecraft/class_2335; ARG 0 from diff --git a/mappings/net/minecraft/util/math/ChunkSectionPos.mapping b/mappings/net/minecraft/util/math/ChunkSectionPos.mapping index e9b9f6ee4f..f8ded65cc4 100644 --- a/mappings/net/minecraft/util/math/ChunkSectionPos.mapping +++ b/mappings/net/minecraft/util/math/ChunkSectionPos.mapping @@ -74,3 +74,6 @@ CLASS net/minecraft/class_4076 net/minecraft/util/math/ChunkSectionPos METHOD method_20439 stream (Lnet/minecraft/class_4076;I)Ljava/util/stream/Stream; ARG 0 center ARG 1 radius + METHOD method_22446 stream (Lnet/minecraft/class_1923;I)Ljava/util/stream/Stream; + ARG 0 center + ARG 1 radius diff --git a/mappings/net/minecraft/util/math/MathHelper.mapping b/mappings/net/minecraft/util/math/MathHelper.mapping index 9cbdbcc944..4301f956b5 100644 --- a/mappings/net/minecraft/util/math/MathHelper.mapping +++ b/mappings/net/minecraft/util/math/MathHelper.mapping @@ -39,6 +39,7 @@ CLASS net/minecraft/class_3532 net/minecraft/util/math/MathHelper ARG 0 r ARG 1 g ARG 2 b + METHOD method_15354 idealHash (I)I METHOD method_15355 sqrt (F)F METHOD method_15356 angleBetween (FF)F ARG 0 first diff --git a/mappings/net/minecraft/util/math/Quaternion.mapping b/mappings/net/minecraft/util/math/Quaternion.mapping index ea5826a5d7..bfefab8f35 100644 --- a/mappings/net/minecraft/util/math/Quaternion.mapping +++ b/mappings/net/minecraft/util/math/Quaternion.mapping @@ -1,4 +1,5 @@ CLASS net/minecraft/class_1158 net/minecraft/util/math/Quaternion + FIELD field_21493 IDENTITY Lnet/minecraft/class_1158; FIELD field_5656 components [F METHOD (FFFF)V ARG 1 b @@ -25,6 +26,7 @@ CLASS net/minecraft/class_1158 net/minecraft/util/math/Quaternion METHOD method_22872 scale (F)V ARG 1 scale METHOD method_22873 normalize ()V + METHOD method_23695 copy ()Lnet/minecraft/class_1158; METHOD method_4921 getB ()F METHOD method_4922 getC ()F METHOD method_4923 getD ()F diff --git a/mappings/net/minecraft/util/math/Vec3i.mapping b/mappings/net/minecraft/util/math/Vec3i.mapping index 7c16a554a8..b09ca0b170 100644 --- a/mappings/net/minecraft/util/math/Vec3i.mapping +++ b/mappings/net/minecraft/util/math/Vec3i.mapping @@ -34,3 +34,6 @@ CLASS net/minecraft/class_2382 net/minecraft/util/math/Vec3i METHOD method_19771 isWithinDistance (Lnet/minecraft/class_2382;D)Z ARG 1 vec ARG 2 distance + METHOD method_23226 offset (Lnet/minecraft/class_2350;I)Lnet/minecraft/class_2382; + METHOD method_23227 down (I)Lnet/minecraft/class_2382; + METHOD method_23228 down ()Lnet/minecraft/class_2382;