From 9b3f90e3025606dedfa65bd0c6ef7f10df43cf5b Mon Sep 17 00:00:00 2001 From: apple502j <33279053+apple502j@users.noreply.github.com> Date: Sat, 20 Aug 2022 23:03:01 +0900 Subject: [PATCH] 1.19.1 bonanza 5: util (#3272) Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> --- .../util/LowercaseEnumTypeAdapterFactory.mapping | 9 +++++++++ mappings/net/minecraft/util/MetricsData.mapping | 1 + .../net/minecraft/util/collection/DataPool.mapping | 2 ++ .../minecraft/util/collection/Int2ObjectBiMap.mapping | 6 ++++++ .../minecraft/util/collection/SortedArraySet.mapping | 11 +++++++++++ .../minecraft/util/crash/CrashReportSection.mapping | 1 + .../minecraft/util/logging/LoggerPrintStream.mapping | 2 ++ .../util/logging/UncaughtExceptionHandler.mapping | 5 +++++ .../util/logging/UncaughtExceptionLogger.mapping | 5 +++++ .../minecraft/util/profiling/jfr/JfrListener.mapping | 2 ++ 10 files changed, 44 insertions(+) diff --git a/mappings/net/minecraft/util/LowercaseEnumTypeAdapterFactory.mapping b/mappings/net/minecraft/util/LowercaseEnumTypeAdapterFactory.mapping index 1d10dd94f1..442bcb7cb4 100644 --- a/mappings/net/minecraft/util/LowercaseEnumTypeAdapterFactory.mapping +++ b/mappings/net/minecraft/util/LowercaseEnumTypeAdapterFactory.mapping @@ -1,3 +1,12 @@ CLASS net/minecraft/class_3530 net/minecraft/util/LowercaseEnumTypeAdapterFactory + METHOD create (Lcom/google/gson/Gson;Lcom/google/gson/reflect/TypeToken;)Lcom/google/gson/TypeAdapter; + ARG 1 gson + ARG 2 typeToken METHOD method_15334 getKey (Ljava/lang/Object;)Ljava/lang/String; ARG 1 o + CLASS 1 + METHOD read (Lcom/google/gson/stream/JsonReader;)Ljava/lang/Object; + ARG 1 reader + METHOD write (Lcom/google/gson/stream/JsonWriter;Ljava/lang/Object;)V + ARG 1 writer + ARG 2 o diff --git a/mappings/net/minecraft/util/MetricsData.mapping b/mappings/net/minecraft/util/MetricsData.mapping index 762854f700..5872a24909 100644 --- a/mappings/net/minecraft/util/MetricsData.mapping +++ b/mappings/net/minecraft/util/MetricsData.mapping @@ -3,6 +3,7 @@ CLASS net/minecraft/class_3517 net/minecraft/util/MetricsData FIELD field_15654 writeIndex I FIELD field_15655 sampleCount I FIELD field_15656 startIndex I + FIELD field_29839 SIZE I METHOD method_15246 getSamples ()[J METHOD method_15247 pushSample (J)V ARG 1 time diff --git a/mappings/net/minecraft/util/collection/DataPool.mapping b/mappings/net/minecraft/util/collection/DataPool.mapping index 0ebf1ee051..4a47c2eb74 100644 --- a/mappings/net/minecraft/util/collection/DataPool.mapping +++ b/mappings/net/minecraft/util/collection/DataPool.mapping @@ -7,6 +7,8 @@ CLASS net/minecraft/class_6005 net/minecraft/util/collection/DataPool METHOD method_38061 of (Ljava/lang/Object;)Lnet/minecraft/class_6005; ARG 0 object METHOD method_38062 empty ()Lnet/minecraft/class_6005; + METHOD method_39521 createEmptyAllowedCodec (Lcom/mojang/serialization/Codec;)Lcom/mojang/serialization/Codec; + ARG 0 dataCodec CLASS class_6006 Builder FIELD field_29926 entries Lcom/google/common/collect/ImmutableList$Builder; METHOD method_34974 build ()Lnet/minecraft/class_6005; diff --git a/mappings/net/minecraft/util/collection/Int2ObjectBiMap.mapping b/mappings/net/minecraft/util/collection/Int2ObjectBiMap.mapping index f7abeb79ea..f6da5326cb 100644 --- a/mappings/net/minecraft/util/collection/Int2ObjectBiMap.mapping +++ b/mappings/net/minecraft/util/collection/Int2ObjectBiMap.mapping @@ -9,6 +9,12 @@ CLASS net/minecraft/class_3513 net/minecraft/util/collection/Int2ObjectBiMap FIELD field_29829 LOAD_FACTOR F METHOD (I)V ARG 1 size + METHOD ([Ljava/lang/Object;[I[Ljava/lang/Object;II)V + ARG 1 values + ARG 2 ids + ARG 3 idToValues + ARG 4 nextId + ARG 5 size METHOD method_15222 getIdFromIndex (I)I ARG 1 index METHOD method_15223 findFree (I)I diff --git a/mappings/net/minecraft/util/collection/SortedArraySet.mapping b/mappings/net/minecraft/util/collection/SortedArraySet.mapping index bbc9d47ccc..6bf19ac20e 100644 --- a/mappings/net/minecraft/util/collection/SortedArraySet.mapping +++ b/mappings/net/minecraft/util/collection/SortedArraySet.mapping @@ -6,6 +6,10 @@ CLASS net/minecraft/class_4706 net/minecraft/util/collection/SortedArraySet METHOD (ILjava/util/Comparator;)V ARG 1 initialCapacity ARG 2 comparator + METHOD add (Ljava/lang/Object;)Z + ARG 1 object + METHOD contains (Ljava/lang/Object;)Z + ARG 1 object METHOD equals (Ljava/lang/Object;)Z ARG 1 o METHOD method_23859 create (I)Lnet/minecraft/class_4706; @@ -30,10 +34,17 @@ CLASS net/minecraft/class_4706 net/minecraft/util/collection/SortedArraySet ARG 1 index METHOD method_34958 create ()Lnet/minecraft/class_4706; METHOD method_34959 create (Ljava/util/Comparator;)Lnet/minecraft/class_4706; + ARG 0 comparator METHOD method_34960 create (Ljava/util/Comparator;I)Lnet/minecraft/class_4706; + ARG 0 comparator ARG 1 initialCapacity METHOD method_34961 getIfContains (Ljava/lang/Object;)Ljava/lang/Object; + ARG 1 object METHOD method_34962 last ()Ljava/lang/Object; + METHOD remove (Ljava/lang/Object;)Z + ARG 1 object + METHOD toArray ([Ljava/lang/Object;)[Ljava/lang/Object; + ARG 1 array CLASS class_4707 SetIterator FIELD field_21566 nextIndex I FIELD field_21567 lastIndex I diff --git a/mappings/net/minecraft/util/crash/CrashReportSection.mapping b/mappings/net/minecraft/util/crash/CrashReportSection.mapping index 88905f917d..102e730b93 100644 --- a/mappings/net/minecraft/util/crash/CrashReportSection.mapping +++ b/mappings/net/minecraft/util/crash/CrashReportSection.mapping @@ -9,6 +9,7 @@ CLASS net/minecraft/class_129 net/minecraft/util/crash/CrashReportSection METHOD method_575 getStackTrace ()[Ljava/lang/StackTraceElement; METHOD method_577 add (Ljava/lang/String;Lnet/minecraft/class_133;)Lnet/minecraft/class_129; ARG 1 name + ARG 2 callable METHOD method_578 add (Ljava/lang/String;Ljava/lang/Object;)Lnet/minecraft/class_129; ARG 1 name ARG 2 detail diff --git a/mappings/net/minecraft/util/logging/LoggerPrintStream.mapping b/mappings/net/minecraft/util/logging/LoggerPrintStream.mapping index d4d4a27a86..bb339657cc 100644 --- a/mappings/net/minecraft/util/logging/LoggerPrintStream.mapping +++ b/mappings/net/minecraft/util/logging/LoggerPrintStream.mapping @@ -6,5 +6,7 @@ CLASS net/minecraft/class_2983 net/minecraft/util/logging/LoggerPrintStream ARG 2 out METHOD method_12870 log (Ljava/lang/String;)V ARG 1 message + METHOD println (Ljava/lang/Object;)V + ARG 1 object METHOD println (Ljava/lang/String;)V ARG 1 message diff --git a/mappings/net/minecraft/util/logging/UncaughtExceptionHandler.mapping b/mappings/net/minecraft/util/logging/UncaughtExceptionHandler.mapping index 8b27c60443..a225953ae4 100644 --- a/mappings/net/minecraft/util/logging/UncaughtExceptionHandler.mapping +++ b/mappings/net/minecraft/util/logging/UncaughtExceptionHandler.mapping @@ -1,2 +1,7 @@ CLASS net/minecraft/class_143 net/minecraft/util/logging/UncaughtExceptionHandler FIELD field_1115 logger Lorg/slf4j/Logger; + METHOD (Lorg/slf4j/Logger;)V + ARG 1 logger + METHOD uncaughtException (Ljava/lang/Thread;Ljava/lang/Throwable;)V + ARG 1 thread + ARG 2 throwable diff --git a/mappings/net/minecraft/util/logging/UncaughtExceptionLogger.mapping b/mappings/net/minecraft/util/logging/UncaughtExceptionLogger.mapping index e450e4b29d..2843759d19 100644 --- a/mappings/net/minecraft/util/logging/UncaughtExceptionLogger.mapping +++ b/mappings/net/minecraft/util/logging/UncaughtExceptionLogger.mapping @@ -1,2 +1,7 @@ CLASS net/minecraft/class_140 net/minecraft/util/logging/UncaughtExceptionLogger FIELD field_1113 logger Lorg/slf4j/Logger; + METHOD (Lorg/slf4j/Logger;)V + ARG 1 logger + METHOD uncaughtException (Ljava/lang/Thread;Ljava/lang/Throwable;)V + ARG 1 thread + ARG 2 throwable diff --git a/mappings/net/minecraft/util/profiling/jfr/JfrListener.mapping b/mappings/net/minecraft/util/profiling/jfr/JfrListener.mapping index 1fec53db90..41f6ac66bc 100644 --- a/mappings/net/minecraft/util/profiling/jfr/JfrListener.mapping +++ b/mappings/net/minecraft/util/profiling/jfr/JfrListener.mapping @@ -4,7 +4,9 @@ CLASS net/minecraft/class_6507 net/minecraft/util/profiling/jfr/JfrListener METHOD (Ljava/lang/Runnable;)V ARG 1 stopCallback METHOD method_37991 log (Ljava/util/function/Supplier;)V + ARG 0 logSupplier METHOD method_37992 warn (Ljava/util/function/Supplier;Ljava/lang/Throwable;)V + ARG 0 logSupplier ARG 1 throwable METHOD method_38663 stop (Ljava/nio/file/Path;)V ARG 1 dumpPath