From 93701715c057a4626e47b8282f29b9c0a857692e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C2=ADSollace?= Date: Wed, 18 Mar 2020 01:04:34 +0200 Subject: [PATCH] Moved a lot of "util" classes to more appropriate packages (#1171) * Moved a lot of "util" classes to more appropriate packages * Move UncaughtExceptionLogger to the correct package * These are all collections/sets/iterables * Move stuff relating to dyamics into util/dynamic * UnaryOperator is only used in the context of loot tables * Functional classes into util/function * Time classes into a util/time package * JsonHelper -> JsonUtil * Whatever that name is, this is a world class * Moved ReusableStream to util/collection * TODO: this name is wrong * Update mappings/net/minecraft/util/io/CsvWriter.mapping Co-Authored-By: liach <7806504+liach@users.noreply.github.com> * Move OffsetDoubleList to the shape package (since it's only used there) * Move CsvWriter to the profiler package * io package is gone :crab_dance: * time package is gone :crab_dance: * And now it lets me add them... * Move Lazy back to util/ * Revert JsonUtil to JsonHelper * Jeon -> Json * Update mappings/net/minecraft/util/Identifier.mapping Co-Authored-By: liach <7806504+liach@users.noreply.github.com> * ids -> initialSize Co-authored-by: liach <7806504+liach@users.noreply.github.com> --- .../operator}/BoundedIntUnaryOperator.mapping | 15 ++++++++++++++- .../{util => network}/PacketByteBuf.mapping | 2 +- .../minecraft/util/DebugPrintStreamLogger.mapping | 1 - mappings/net/minecraft/util/Identifier.mapping | 8 ++++++++ .../net/minecraft/util/IndexedIterable.mapping | 3 --- mappings/net/minecraft/util/LowercaseMap.mapping | 2 -- .../util/UncaughtExceptionHandler.mapping | 2 -- .../util/UncaughtExceptionLogger.mapping | 2 -- mappings/net/minecraft/util/UserCache.mapping | 4 ++++ .../util/{ => collection}/DefaultedList.mapping | 2 +- .../util/{ => collection}/IdList.mapping | 7 ++++++- .../util/collection/IndexedIterable.mapping | 3 +++ .../util/{ => collection}/Int2ObjectBiMap.mapping | 14 +++++++++++++- .../util/collection/LowercaseMap.mapping | 2 ++ .../util/{ => collection}/MapUtil.mapping | 2 +- .../{ => collection}/PackedIntegerArray.mapping | 2 +- .../util/{ => collection}/ReusableStream.mapping | 3 ++- .../util/{ => collection}/SortedArraySet.mapping | 2 +- .../{ => collection}/TypeFilterableList.mapping | 2 +- .../util/{ => collection}/WeightedList.mapping | 2 +- .../util/{ => collection}/WeightedPicker.mapping | 2 +- .../{ => dynamic}/DynamicDeserializer.mapping | 2 +- .../{ => dynamic}/DynamicSerializable.mapping | 2 +- .../DynamicSerializableBoolean.mapping | 4 +++- .../{ => dynamic}/DynamicSerializableUuid.mapping | 2 +- .../util/{ => dynamic}/Timestamp.mapping | 2 +- .../util/{ => function}/BooleanBiFunction.mapping | 2 +- .../util/{ => function}/MaterialPredicate.mapping | 2 +- .../util/logging/DebugPrintStreamLogger.mapping | 1 + .../util/{ => logging}/PrintStreamLogger.mapping | 5 +++-- .../util/logging/UncaughtExceptionHandler.mapping | 2 ++ .../util/logging/UncaughtExceptionLogger.mapping | 2 ++ .../util/{ => profiler}/CsvWriter.mapping | 6 ++++-- .../util/{ => profiler}/TickTimeTracker.mapping | 2 +- .../util/{ => shape}/OffsetDoubleList.mapping | 2 +- .../SectionDistanceLevelPropagator.mapping | 2 +- 36 files changed, 84 insertions(+), 36 deletions(-) rename mappings/net/minecraft/{util => loot/operator}/BoundedIntUnaryOperator.mapping (55%) rename mappings/net/minecraft/{util => network}/PacketByteBuf.mapping (97%) delete mode 100644 mappings/net/minecraft/util/DebugPrintStreamLogger.mapping delete mode 100644 mappings/net/minecraft/util/IndexedIterable.mapping delete mode 100644 mappings/net/minecraft/util/LowercaseMap.mapping delete mode 100644 mappings/net/minecraft/util/UncaughtExceptionHandler.mapping delete mode 100644 mappings/net/minecraft/util/UncaughtExceptionLogger.mapping rename mappings/net/minecraft/util/{ => collection}/DefaultedList.mapping (90%) rename mappings/net/minecraft/util/{ => collection}/IdList.mapping (67%) create mode 100644 mappings/net/minecraft/util/collection/IndexedIterable.mapping rename mappings/net/minecraft/util/{ => collection}/Int2ObjectBiMap.mapping (73%) create mode 100644 mappings/net/minecraft/util/collection/LowercaseMap.mapping rename mappings/net/minecraft/util/{ => collection}/MapUtil.mapping (79%) rename mappings/net/minecraft/util/{ => collection}/PackedIntegerArray.mapping (88%) rename mappings/net/minecraft/util/{ => collection}/ReusableStream.mapping (60%) rename mappings/net/minecraft/util/{ => collection}/SortedArraySet.mapping (92%) rename mappings/net/minecraft/util/{ => collection}/TypeFilterableList.mapping (84%) rename mappings/net/minecraft/util/{ => collection}/WeightedList.mapping (93%) rename mappings/net/minecraft/util/{ => collection}/WeightedPicker.mapping (87%) rename mappings/net/minecraft/util/{ => dynamic}/DynamicDeserializer.mapping (81%) rename mappings/net/minecraft/util/{ => dynamic}/DynamicSerializable.mapping (57%) rename mappings/net/minecraft/util/{ => dynamic}/DynamicSerializableBoolean.mapping (63%) rename mappings/net/minecraft/util/{ => dynamic}/DynamicSerializableUuid.mapping (72%) rename mappings/net/minecraft/util/{ => dynamic}/Timestamp.mapping (81%) rename mappings/net/minecraft/util/{ => function}/BooleanBiFunction.mapping (91%) rename mappings/net/minecraft/util/{ => function}/MaterialPredicate.mapping (72%) create mode 100644 mappings/net/minecraft/util/logging/DebugPrintStreamLogger.mapping rename mappings/net/minecraft/util/{ => logging}/PrintStreamLogger.mapping (68%) create mode 100644 mappings/net/minecraft/util/logging/UncaughtExceptionHandler.mapping create mode 100644 mappings/net/minecraft/util/logging/UncaughtExceptionLogger.mapping rename mappings/net/minecraft/util/{ => profiler}/CsvWriter.mapping (86%) rename mappings/net/minecraft/util/{ => profiler}/TickTimeTracker.mapping (87%) rename mappings/net/minecraft/util/{ => shape}/OffsetDoubleList.mapping (76%) rename mappings/net/minecraft/{util => world}/SectionDistanceLevelPropagator.mapping (61%) diff --git a/mappings/net/minecraft/util/BoundedIntUnaryOperator.mapping b/mappings/net/minecraft/loot/operator/BoundedIntUnaryOperator.mapping similarity index 55% rename from mappings/net/minecraft/util/BoundedIntUnaryOperator.mapping rename to mappings/net/minecraft/loot/operator/BoundedIntUnaryOperator.mapping index db08fdb518..194a60a0c8 100644 --- a/mappings/net/minecraft/util/BoundedIntUnaryOperator.mapping +++ b/mappings/net/minecraft/loot/operator/BoundedIntUnaryOperator.mapping @@ -1,12 +1,25 @@ -CLASS net/minecraft/class_42 net/minecraft/util/BoundedIntUnaryOperator +CLASS net/minecraft/class_42 net/minecraft/loot/operator/BoundedIntUnaryOperator FIELD field_919 operator Ljava/util/function/IntUnaryOperator; FIELD field_920 max Ljava/lang/Integer; FIELD field_921 min Ljava/lang/Integer; + METHOD (Ljava/lang/Integer;Ljava/lang/Integer;)V + ARG 1 min + ARG 2 max + METHOD applyAsInt (I)I + ARG 1 value METHOD method_277 createMax (I)Lnet/minecraft/class_42; + ARG 0 max METHOD method_280 createMin (I)Lnet/minecraft/class_42; + ARG 0 min METHOD method_282 create (II)Lnet/minecraft/class_42; + ARG 0 min + ARG 1 max CLASS class_43 Serializer METHOD deserialize (Lcom/google/gson/JsonElement;Ljava/lang/reflect/Type;Lcom/google/gson/JsonDeserializationContext;)Ljava/lang/Object; ARG 1 functionJson ARG 2 unused ARG 3 context + METHOD serialize (Ljava/lang/Object;Ljava/lang/reflect/Type;Lcom/google/gson/JsonSerializationContext;)Lcom/google/gson/JsonElement; + ARG 1 op + ARG 2 type + ARG 3 context diff --git a/mappings/net/minecraft/util/PacketByteBuf.mapping b/mappings/net/minecraft/network/PacketByteBuf.mapping similarity index 97% rename from mappings/net/minecraft/util/PacketByteBuf.mapping rename to mappings/net/minecraft/network/PacketByteBuf.mapping index 044daed4a4..3717041267 100644 --- a/mappings/net/minecraft/util/PacketByteBuf.mapping +++ b/mappings/net/minecraft/network/PacketByteBuf.mapping @@ -1,4 +1,4 @@ -CLASS net/minecraft/class_2540 net/minecraft/util/PacketByteBuf +CLASS net/minecraft/class_2540 net/minecraft/network/PacketByteBuf FIELD field_11695 parent Lio/netty/buffer/ByteBuf; METHOD method_10787 readIntArray ()[I METHOD method_10788 writeString (Ljava/lang/String;I)Lnet/minecraft/class_2540; diff --git a/mappings/net/minecraft/util/DebugPrintStreamLogger.mapping b/mappings/net/minecraft/util/DebugPrintStreamLogger.mapping deleted file mode 100644 index b33f071739..0000000000 --- a/mappings/net/minecraft/util/DebugPrintStreamLogger.mapping +++ /dev/null @@ -1 +0,0 @@ -CLASS net/minecraft/class_2980 net/minecraft/util/DebugPrintStreamLogger diff --git a/mappings/net/minecraft/util/Identifier.mapping b/mappings/net/minecraft/util/Identifier.mapping index d2c33ff145..29ea434263 100644 --- a/mappings/net/minecraft/util/Identifier.mapping +++ b/mappings/net/minecraft/util/Identifier.mapping @@ -38,3 +38,11 @@ CLASS net/minecraft/class_2960 net/minecraft/util/Identifier METHOD method_20209 isNamespaceValid (Ljava/lang/String;)Z ARG 0 namespace CLASS class_2961 Serializer + METHOD deserialize (Lcom/google/gson/JsonElement;Ljava/lang/reflect/Type;Lcom/google/gson/JsonDeserializationContext;)Ljava/lang/Object; + ARG 1 json + ARG 2 type + ARG 3 context + METHOD serialize (Ljava/lang/Object;Ljava/lang/reflect/Type;Lcom/google/gson/JsonSerializationContext;)Lcom/google/gson/JsonElement; + ARG 1 id + ARG 2 type + ARG 3 context diff --git a/mappings/net/minecraft/util/IndexedIterable.mapping b/mappings/net/minecraft/util/IndexedIterable.mapping deleted file mode 100644 index 2ced9c386b..0000000000 --- a/mappings/net/minecraft/util/IndexedIterable.mapping +++ /dev/null @@ -1,3 +0,0 @@ -CLASS net/minecraft/class_2359 net/minecraft/util/IndexedIterable - METHOD method_10200 get (I)Ljava/lang/Object; - ARG 1 index diff --git a/mappings/net/minecraft/util/LowercaseMap.mapping b/mappings/net/minecraft/util/LowercaseMap.mapping deleted file mode 100644 index cf713f4324..0000000000 --- a/mappings/net/minecraft/util/LowercaseMap.mapping +++ /dev/null @@ -1,2 +0,0 @@ -CLASS net/minecraft/class_3522 net/minecraft/util/LowercaseMap - FIELD field_15666 delegate Ljava/util/Map; diff --git a/mappings/net/minecraft/util/UncaughtExceptionHandler.mapping b/mappings/net/minecraft/util/UncaughtExceptionHandler.mapping deleted file mode 100644 index 0dc0e9e48c..0000000000 --- a/mappings/net/minecraft/util/UncaughtExceptionHandler.mapping +++ /dev/null @@ -1,2 +0,0 @@ -CLASS net/minecraft/class_143 net/minecraft/util/UncaughtExceptionHandler - FIELD field_1115 logger Lorg/apache/logging/log4j/Logger; diff --git a/mappings/net/minecraft/util/UncaughtExceptionLogger.mapping b/mappings/net/minecraft/util/UncaughtExceptionLogger.mapping deleted file mode 100644 index 2dd98d1fab..0000000000 --- a/mappings/net/minecraft/util/UncaughtExceptionLogger.mapping +++ /dev/null @@ -1,2 +0,0 @@ -CLASS net/minecraft/class_140 net/minecraft/util/UncaughtExceptionLogger - FIELD field_1113 logger Lorg/apache/logging/log4j/Logger; diff --git a/mappings/net/minecraft/util/UserCache.mapping b/mappings/net/minecraft/util/UserCache.mapping index 2a3fac21ef..7a306e2c69 100644 --- a/mappings/net/minecraft/util/UserCache.mapping +++ b/mappings/net/minecraft/util/UserCache.mapping @@ -10,6 +10,7 @@ CLASS net/minecraft/class_3312 net/minecraft/util/UserCache FIELD field_14318 gson Lcom/google/gson/Gson; METHOD (Lcom/mojang/authlib/GameProfileRepository;Ljava/io/File;)V ARG 1 profileRepository + ARG 2 cacheFile METHOD method_14508 add (Lcom/mojang/authlib/GameProfile;)V METHOD method_14509 findProfileByName (Lcom/mojang/authlib/GameProfileRepository;Ljava/lang/String;)Lcom/mojang/authlib/GameProfile; ARG 0 repository @@ -34,6 +35,9 @@ CLASS net/minecraft/class_3312 net/minecraft/util/UserCache CLASS class_3313 Entry FIELD field_14319 expirationDate Ljava/util/Date; FIELD field_14321 profile Lcom/mojang/authlib/GameProfile; + METHOD (Lnet/minecraft/class_3312;Lcom/mojang/authlib/GameProfile;Ljava/util/Date;)V + ARG 2 profile + ARG 3 expiryDate METHOD method_14519 getProfile ()Lcom/mojang/authlib/GameProfile; METHOD method_14520 getExpirationDate ()Ljava/util/Date; CLASS class_3314 JsonConverter diff --git a/mappings/net/minecraft/util/DefaultedList.mapping b/mappings/net/minecraft/util/collection/DefaultedList.mapping similarity index 90% rename from mappings/net/minecraft/util/DefaultedList.mapping rename to mappings/net/minecraft/util/collection/DefaultedList.mapping index e2bfbde38e..47d7609afd 100644 --- a/mappings/net/minecraft/util/DefaultedList.mapping +++ b/mappings/net/minecraft/util/collection/DefaultedList.mapping @@ -1,4 +1,4 @@ -CLASS net/minecraft/class_2371 net/minecraft/util/DefaultedList +CLASS net/minecraft/class_2371 net/minecraft/util/collection/DefaultedList FIELD field_11115 delegate Ljava/util/List; FIELD field_11116 initialElement Ljava/lang/Object; METHOD (Ljava/util/List;Ljava/lang/Object;)V diff --git a/mappings/net/minecraft/util/IdList.mapping b/mappings/net/minecraft/util/collection/IdList.mapping similarity index 67% rename from mappings/net/minecraft/util/IdList.mapping rename to mappings/net/minecraft/util/collection/IdList.mapping index 109b66055d..90b29408bb 100644 --- a/mappings/net/minecraft/util/IdList.mapping +++ b/mappings/net/minecraft/util/collection/IdList.mapping @@ -1,9 +1,14 @@ -CLASS net/minecraft/class_2361 net/minecraft/util/IdList +CLASS net/minecraft/class_2361 net/minecraft/util/collection/IdList FIELD field_11098 list Ljava/util/List; FIELD field_11099 nextId I FIELD field_11100 idMap Ljava/util/IdentityHashMap; + METHOD (I)V + ARG 1 initialSize METHOD method_10203 set (Ljava/lang/Object;I)V ARG 1 value + ARG 2 id METHOD method_10204 size ()I METHOD method_10205 add (Ljava/lang/Object;)V + ARG 1 value METHOD method_10206 getId (Ljava/lang/Object;)I + ARG 1 value diff --git a/mappings/net/minecraft/util/collection/IndexedIterable.mapping b/mappings/net/minecraft/util/collection/IndexedIterable.mapping new file mode 100644 index 0000000000..4d754790ad --- /dev/null +++ b/mappings/net/minecraft/util/collection/IndexedIterable.mapping @@ -0,0 +1,3 @@ +CLASS net/minecraft/class_2359 net/minecraft/util/collection/IndexedIterable + METHOD method_10200 get (I)Ljava/lang/Object; + ARG 1 index diff --git a/mappings/net/minecraft/util/Int2ObjectBiMap.mapping b/mappings/net/minecraft/util/collection/Int2ObjectBiMap.mapping similarity index 73% rename from mappings/net/minecraft/util/Int2ObjectBiMap.mapping rename to mappings/net/minecraft/util/collection/Int2ObjectBiMap.mapping index ab1422146f..efeb0f3e32 100644 --- a/mappings/net/minecraft/util/Int2ObjectBiMap.mapping +++ b/mappings/net/minecraft/util/collection/Int2ObjectBiMap.mapping @@ -1,18 +1,30 @@ -CLASS net/minecraft/class_3513 net/minecraft/util/Int2ObjectBiMap +CLASS net/minecraft/class_3513 net/minecraft/util/collection/Int2ObjectBiMap FIELD field_15646 ids [I FIELD field_15647 idToValues [Ljava/lang/Object; FIELD field_15648 size I FIELD field_15649 nextId I FIELD field_15650 empty Ljava/lang/Object; FIELD field_15651 values [Ljava/lang/Object; + METHOD (I)V + ARG 1 size METHOD method_15222 getIdFromIndex (I)I + ARG 1 index METHOD method_15223 findFree (I)I + ARG 1 size METHOD method_15224 resize (I)V + ARG 1 newSize METHOD method_15225 add (Ljava/lang/Object;)I + ARG 1 value METHOD method_15226 nextId ()I METHOD method_15227 size ()I METHOD method_15228 getIdealIndex (Ljava/lang/Object;)I + ARG 1 value METHOD method_15229 clear ()V METHOD method_15230 put (Ljava/lang/Object;I)V + ARG 1 value + ARG 2 id METHOD method_15231 getId (Ljava/lang/Object;)I + ARG 1 value METHOD method_15232 findIndex (Ljava/lang/Object;I)I + ARG 1 value + ARG 2 id diff --git a/mappings/net/minecraft/util/collection/LowercaseMap.mapping b/mappings/net/minecraft/util/collection/LowercaseMap.mapping new file mode 100644 index 0000000000..c509888af1 --- /dev/null +++ b/mappings/net/minecraft/util/collection/LowercaseMap.mapping @@ -0,0 +1,2 @@ +CLASS net/minecraft/class_3522 net/minecraft/util/collection/LowercaseMap + FIELD field_15666 delegate Ljava/util/Map; diff --git a/mappings/net/minecraft/util/MapUtil.mapping b/mappings/net/minecraft/util/collection/MapUtil.mapping similarity index 79% rename from mappings/net/minecraft/util/MapUtil.mapping rename to mappings/net/minecraft/util/collection/MapUtil.mapping index 37d6fb4da8..2f7f9d32f7 100644 --- a/mappings/net/minecraft/util/MapUtil.mapping +++ b/mappings/net/minecraft/util/collection/MapUtil.mapping @@ -1,4 +1,4 @@ -CLASS net/minecraft/class_2367 net/minecraft/util/MapUtil +CLASS net/minecraft/class_2367 net/minecraft/util/collection/MapUtil METHOD method_10208 createMap (Ljava/lang/Iterable;Ljava/lang/Iterable;Ljava/util/Map;)Ljava/util/Map; ARG 0 keys ARG 1 values diff --git a/mappings/net/minecraft/util/PackedIntegerArray.mapping b/mappings/net/minecraft/util/collection/PackedIntegerArray.mapping similarity index 88% rename from mappings/net/minecraft/util/PackedIntegerArray.mapping rename to mappings/net/minecraft/util/collection/PackedIntegerArray.mapping index a6fc156f28..3ad23f2656 100644 --- a/mappings/net/minecraft/util/PackedIntegerArray.mapping +++ b/mappings/net/minecraft/util/collection/PackedIntegerArray.mapping @@ -1,4 +1,4 @@ -CLASS net/minecraft/class_3508 net/minecraft/util/PackedIntegerArray +CLASS net/minecraft/class_3508 net/minecraft/util/collection/PackedIntegerArray FIELD field_15631 storage [J FIELD field_15632 size I FIELD field_15633 elementBits I diff --git a/mappings/net/minecraft/util/ReusableStream.mapping b/mappings/net/minecraft/util/collection/ReusableStream.mapping similarity index 60% rename from mappings/net/minecraft/util/ReusableStream.mapping rename to mappings/net/minecraft/util/collection/ReusableStream.mapping index cca53ed5c6..bde72f209b 100644 --- a/mappings/net/minecraft/util/ReusableStream.mapping +++ b/mappings/net/minecraft/util/collection/ReusableStream.mapping @@ -1,4 +1,5 @@ -CLASS net/minecraft/class_3538 net/minecraft/util/ReusableStream +CLASS net/minecraft/class_3538 net/minecraft/util/collection/ReusableStream + COMMENT A wrapper that automatically flattens the original stream and provides duplicates iterating a copy of that stream's output. FIELD field_15745 collectedElements Ljava/util/List; FIELD field_15746 source Ljava/util/Spliterator; METHOD (Ljava/util/stream/Stream;)V diff --git a/mappings/net/minecraft/util/SortedArraySet.mapping b/mappings/net/minecraft/util/collection/SortedArraySet.mapping similarity index 92% rename from mappings/net/minecraft/util/SortedArraySet.mapping rename to mappings/net/minecraft/util/collection/SortedArraySet.mapping index 21e58349d0..c2b6cca514 100644 --- a/mappings/net/minecraft/util/SortedArraySet.mapping +++ b/mappings/net/minecraft/util/collection/SortedArraySet.mapping @@ -1,4 +1,4 @@ -CLASS net/minecraft/class_4706 net/minecraft/util/SortedArraySet +CLASS net/minecraft/class_4706 net/minecraft/util/collection/SortedArraySet FIELD field_21562 comparator Ljava/util/Comparator; FIELD field_21563 elements [Ljava/lang/Object; FIELD field_21564 size I diff --git a/mappings/net/minecraft/util/TypeFilterableList.mapping b/mappings/net/minecraft/util/collection/TypeFilterableList.mapping similarity index 84% rename from mappings/net/minecraft/util/TypeFilterableList.mapping rename to mappings/net/minecraft/util/collection/TypeFilterableList.mapping index 9bc85f5b0d..ec4a004e77 100644 --- a/mappings/net/minecraft/util/TypeFilterableList.mapping +++ b/mappings/net/minecraft/util/collection/TypeFilterableList.mapping @@ -1,4 +1,4 @@ -CLASS net/minecraft/class_3509 net/minecraft/util/TypeFilterableList +CLASS net/minecraft/class_3509 net/minecraft/util/collection/TypeFilterableList FIELD field_15635 allElements Ljava/util/List; FIELD field_15636 elementsByType Ljava/util/Map; FIELD field_15637 elementType Ljava/lang/Class; diff --git a/mappings/net/minecraft/util/WeightedList.mapping b/mappings/net/minecraft/util/collection/WeightedList.mapping similarity index 93% rename from mappings/net/minecraft/util/WeightedList.mapping rename to mappings/net/minecraft/util/collection/WeightedList.mapping index a09114bab6..d6b54f729e 100644 --- a/mappings/net/minecraft/util/WeightedList.mapping +++ b/mappings/net/minecraft/util/collection/WeightedList.mapping @@ -1,4 +1,4 @@ -CLASS net/minecraft/class_4131 net/minecraft/util/WeightedList +CLASS net/minecraft/class_4131 net/minecraft/util/collection/WeightedList FIELD field_18397 entries Ljava/util/List; FIELD field_18398 random Ljava/util/Random; METHOD method_19029 shuffle ()Lnet/minecraft/class_4131; diff --git a/mappings/net/minecraft/util/WeightedPicker.mapping b/mappings/net/minecraft/util/collection/WeightedPicker.mapping similarity index 87% rename from mappings/net/minecraft/util/WeightedPicker.mapping rename to mappings/net/minecraft/util/collection/WeightedPicker.mapping index d62b5ccb39..5e86df1af0 100644 --- a/mappings/net/minecraft/util/WeightedPicker.mapping +++ b/mappings/net/minecraft/util/collection/WeightedPicker.mapping @@ -1,4 +1,4 @@ -CLASS net/minecraft/class_3549 net/minecraft/util/WeightedPicker +CLASS net/minecraft/class_3549 net/minecraft/util/collection/WeightedPicker METHOD method_15444 getRandom (Ljava/util/Random;Ljava/util/List;I)Lnet/minecraft/class_3549$class_3550; ARG 0 random ARG 1 list diff --git a/mappings/net/minecraft/util/DynamicDeserializer.mapping b/mappings/net/minecraft/util/dynamic/DynamicDeserializer.mapping similarity index 81% rename from mappings/net/minecraft/util/DynamicDeserializer.mapping rename to mappings/net/minecraft/util/dynamic/DynamicDeserializer.mapping index 88000ff661..14ee651f1f 100644 --- a/mappings/net/minecraft/util/DynamicDeserializer.mapping +++ b/mappings/net/minecraft/util/dynamic/DynamicDeserializer.mapping @@ -1,4 +1,4 @@ -CLASS net/minecraft/class_3817 net/minecraft/util/DynamicDeserializer +CLASS net/minecraft/class_3817 net/minecraft/util/dynamic/DynamicDeserializer FIELD field_16866 LOGGER Lorg/apache/logging/log4j/Logger; METHOD deserialize (Lcom/mojang/datafixers/Dynamic;)Ljava/lang/Object; ARG 1 dynamic diff --git a/mappings/net/minecraft/util/DynamicSerializable.mapping b/mappings/net/minecraft/util/dynamic/DynamicSerializable.mapping similarity index 57% rename from mappings/net/minecraft/util/DynamicSerializable.mapping rename to mappings/net/minecraft/util/dynamic/DynamicSerializable.mapping index 06a385a91e..9c19e6623b 100644 --- a/mappings/net/minecraft/util/DynamicSerializable.mapping +++ b/mappings/net/minecraft/util/dynamic/DynamicSerializable.mapping @@ -1,3 +1,3 @@ -CLASS net/minecraft/class_4213 net/minecraft/util/DynamicSerializable +CLASS net/minecraft/class_4213 net/minecraft/util/dynamic/DynamicSerializable METHOD method_19508 serialize (Lcom/mojang/datafixers/types/DynamicOps;)Ljava/lang/Object; ARG 1 ops diff --git a/mappings/net/minecraft/util/DynamicSerializableBoolean.mapping b/mappings/net/minecraft/util/dynamic/DynamicSerializableBoolean.mapping similarity index 63% rename from mappings/net/minecraft/util/DynamicSerializableBoolean.mapping rename to mappings/net/minecraft/util/dynamic/DynamicSerializableBoolean.mapping index b24aa27bc1..8b5d4df54a 100644 --- a/mappings/net/minecraft/util/DynamicSerializableBoolean.mapping +++ b/mappings/net/minecraft/util/dynamic/DynamicSerializableBoolean.mapping @@ -1,7 +1,9 @@ -CLASS net/minecraft/class_4909 net/minecraft/util/DynamicSerializableBoolean +CLASS net/minecraft/class_4909 net/minecraft/util/dynamic/DynamicSerializableBoolean FIELD field_22829 value Z METHOD (Z)V ARG 1 value + METHOD equals (Ljava/lang/Object;)Z + ARG 1 o METHOD method_25506 of (Lcom/mojang/datafixers/Dynamic;)Lnet/minecraft/class_4909; ARG 0 dynamic METHOD method_25507 of (Z)Lnet/minecraft/class_4909; diff --git a/mappings/net/minecraft/util/DynamicSerializableUuid.mapping b/mappings/net/minecraft/util/dynamic/DynamicSerializableUuid.mapping similarity index 72% rename from mappings/net/minecraft/util/DynamicSerializableUuid.mapping rename to mappings/net/minecraft/util/dynamic/DynamicSerializableUuid.mapping index e5099b71b2..7c270c9ba0 100644 --- a/mappings/net/minecraft/util/DynamicSerializableUuid.mapping +++ b/mappings/net/minecraft/util/dynamic/DynamicSerializableUuid.mapping @@ -1,4 +1,4 @@ -CLASS net/minecraft/class_4844 net/minecraft/util/DynamicSerializableUuid +CLASS net/minecraft/class_4844 net/minecraft/util/dynamic/DynamicSerializableUuid FIELD field_22412 uuid Ljava/util/UUID; METHOD (Ljava/util/UUID;)V ARG 1 uuid diff --git a/mappings/net/minecraft/util/Timestamp.mapping b/mappings/net/minecraft/util/dynamic/Timestamp.mapping similarity index 81% rename from mappings/net/minecraft/util/Timestamp.mapping rename to mappings/net/minecraft/util/dynamic/Timestamp.mapping index 7b7decb967..3906eb480f 100644 --- a/mappings/net/minecraft/util/Timestamp.mapping +++ b/mappings/net/minecraft/util/dynamic/Timestamp.mapping @@ -1,4 +1,4 @@ -CLASS net/minecraft/class_4316 net/minecraft/util/Timestamp +CLASS net/minecraft/class_4316 net/minecraft/util/dynamic/Timestamp FIELD field_19418 time J METHOD (J)V ARG 1 time diff --git a/mappings/net/minecraft/util/BooleanBiFunction.mapping b/mappings/net/minecraft/util/function/BooleanBiFunction.mapping similarity index 91% rename from mappings/net/minecraft/util/BooleanBiFunction.mapping rename to mappings/net/minecraft/util/function/BooleanBiFunction.mapping index 7bd921891b..7ed08b559f 100644 --- a/mappings/net/minecraft/util/BooleanBiFunction.mapping +++ b/mappings/net/minecraft/util/function/BooleanBiFunction.mapping @@ -1,4 +1,4 @@ -CLASS net/minecraft/class_247 net/minecraft/util/BooleanBiFunction +CLASS net/minecraft/class_247 net/minecraft/util/function/BooleanBiFunction FIELD field_1366 OR Lnet/minecraft/class_247; FIELD field_16885 NOT_OR Lnet/minecraft/class_247; FIELD field_16886 ONLY_FIRST Lnet/minecraft/class_247; diff --git a/mappings/net/minecraft/util/MaterialPredicate.mapping b/mappings/net/minecraft/util/function/MaterialPredicate.mapping similarity index 72% rename from mappings/net/minecraft/util/MaterialPredicate.mapping rename to mappings/net/minecraft/util/function/MaterialPredicate.mapping index 91e9d39b78..9260079573 100644 --- a/mappings/net/minecraft/util/MaterialPredicate.mapping +++ b/mappings/net/minecraft/util/function/MaterialPredicate.mapping @@ -1,4 +1,4 @@ -CLASS net/minecraft/class_2710 net/minecraft/util/MaterialPredicate +CLASS net/minecraft/class_2710 net/minecraft/util/function/MaterialPredicate FIELD field_12404 IS_AIR Lnet/minecraft/class_2710; FIELD field_12405 material Lnet/minecraft/class_3614; METHOD method_11746 create (Lnet/minecraft/class_3614;)Lnet/minecraft/class_2710; diff --git a/mappings/net/minecraft/util/logging/DebugPrintStreamLogger.mapping b/mappings/net/minecraft/util/logging/DebugPrintStreamLogger.mapping new file mode 100644 index 0000000000..2da7c9b9e9 --- /dev/null +++ b/mappings/net/minecraft/util/logging/DebugPrintStreamLogger.mapping @@ -0,0 +1 @@ +CLASS net/minecraft/class_2980 net/minecraft/util/logging/DebugPrintStreamLogger diff --git a/mappings/net/minecraft/util/PrintStreamLogger.mapping b/mappings/net/minecraft/util/logging/PrintStreamLogger.mapping similarity index 68% rename from mappings/net/minecraft/util/PrintStreamLogger.mapping rename to mappings/net/minecraft/util/logging/PrintStreamLogger.mapping index 88768519dd..062a9fd156 100644 --- a/mappings/net/minecraft/util/PrintStreamLogger.mapping +++ b/mappings/net/minecraft/util/logging/PrintStreamLogger.mapping @@ -1,7 +1,8 @@ -CLASS net/minecraft/class_2983 net/minecraft/util/PrintStreamLogger +CLASS net/minecraft/class_2983 net/minecraft/util/logging/PrintStreamLogger FIELD field_13383 name Ljava/lang/String; FIELD field_13384 LOGGER Lorg/apache/logging/log4j/Logger; METHOD (Ljava/lang/String;Ljava/io/OutputStream;)V ARG 1 name - ARG 2 outputStream + ARG 2 out METHOD method_12870 log (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 new file mode 100644 index 0000000000..cbe1074078 --- /dev/null +++ b/mappings/net/minecraft/util/logging/UncaughtExceptionHandler.mapping @@ -0,0 +1,2 @@ +CLASS net/minecraft/class_143 net/minecraft/util/logging/UncaughtExceptionHandler + FIELD field_1115 logger Lorg/apache/logging/log4j/Logger; diff --git a/mappings/net/minecraft/util/logging/UncaughtExceptionLogger.mapping b/mappings/net/minecraft/util/logging/UncaughtExceptionLogger.mapping new file mode 100644 index 0000000000..3dcb4310dc --- /dev/null +++ b/mappings/net/minecraft/util/logging/UncaughtExceptionLogger.mapping @@ -0,0 +1,2 @@ +CLASS net/minecraft/class_140 net/minecraft/util/logging/UncaughtExceptionLogger + FIELD field_1113 logger Lorg/apache/logging/log4j/Logger; diff --git a/mappings/net/minecraft/util/CsvWriter.mapping b/mappings/net/minecraft/util/profiler/CsvWriter.mapping similarity index 86% rename from mappings/net/minecraft/util/CsvWriter.mapping rename to mappings/net/minecraft/util/profiler/CsvWriter.mapping index a93c9b9b12..90682e21f2 100644 --- a/mappings/net/minecraft/util/CsvWriter.mapping +++ b/mappings/net/minecraft/util/profiler/CsvWriter.mapping @@ -1,4 +1,4 @@ -CLASS net/minecraft/class_4456 net/minecraft/util/CsvWriter +CLASS net/minecraft/class_4456 net/minecraft/util/profiler/CsvWriter FIELD field_20284 writer Ljava/io/Writer; FIELD field_20285 column I METHOD (Ljava/io/Writer;Ljava/util/List;)V @@ -6,7 +6,7 @@ CLASS net/minecraft/class_4456 net/minecraft/util/CsvWriter ARG 2 headers METHOD method_21627 makeHeader ()Lnet/minecraft/class_4456$class_4457; METHOD method_21628 print (Ljava/lang/Object;)Ljava/lang/String; - ARG 0 object + ARG 0 o METHOD method_21629 printRow (Ljava/util/stream/Stream;)V ARG 1 columns METHOD method_21630 printRow ([Ljava/lang/Object;)V @@ -14,4 +14,6 @@ CLASS net/minecraft/class_4456 net/minecraft/util/CsvWriter CLASS class_4457 Header FIELD field_20286 columns Ljava/util/List; METHOD method_21631 startBody (Ljava/io/Writer;)Lnet/minecraft/class_4456; + ARG 1 writer METHOD method_21632 addColumn (Ljava/lang/String;)Lnet/minecraft/class_4456$class_4457; + ARG 1 name diff --git a/mappings/net/minecraft/util/TickTimeTracker.mapping b/mappings/net/minecraft/util/profiler/TickTimeTracker.mapping similarity index 87% rename from mappings/net/minecraft/util/TickTimeTracker.mapping rename to mappings/net/minecraft/util/profiler/TickTimeTracker.mapping index 86444cc06a..85407429be 100644 --- a/mappings/net/minecraft/util/TickTimeTracker.mapping +++ b/mappings/net/minecraft/util/profiler/TickTimeTracker.mapping @@ -1,4 +1,4 @@ -CLASS net/minecraft/class_4757 net/minecraft/util/TickTimeTracker +CLASS net/minecraft/class_4757 net/minecraft/util/profiler/TickTimeTracker FIELD field_21962 timeGetter Ljava/util/function/LongSupplier; FIELD field_21963 tickGetter Ljava/util/function/IntSupplier; FIELD field_21964 profiler Lnet/minecraft/class_3693; diff --git a/mappings/net/minecraft/util/OffsetDoubleList.mapping b/mappings/net/minecraft/util/shape/OffsetDoubleList.mapping similarity index 76% rename from mappings/net/minecraft/util/OffsetDoubleList.mapping rename to mappings/net/minecraft/util/shape/OffsetDoubleList.mapping index a4a5b4b061..8c4c632f33 100644 --- a/mappings/net/minecraft/util/OffsetDoubleList.mapping +++ b/mappings/net/minecraft/util/shape/OffsetDoubleList.mapping @@ -1,4 +1,4 @@ -CLASS net/minecraft/class_261 net/minecraft/util/OffsetDoubleList +CLASS net/minecraft/class_261 net/minecraft/util/shape/OffsetDoubleList FIELD field_1386 offset D FIELD field_1387 oldList Lit/unimi/dsi/fastutil/doubles/DoubleList; METHOD (Lit/unimi/dsi/fastutil/doubles/DoubleList;D)V diff --git a/mappings/net/minecraft/util/SectionDistanceLevelPropagator.mapping b/mappings/net/minecraft/world/SectionDistanceLevelPropagator.mapping similarity index 61% rename from mappings/net/minecraft/util/SectionDistanceLevelPropagator.mapping rename to mappings/net/minecraft/world/SectionDistanceLevelPropagator.mapping index 1531d3e3ba..78c3e82775 100644 --- a/mappings/net/minecraft/util/SectionDistanceLevelPropagator.mapping +++ b/mappings/net/minecraft/world/SectionDistanceLevelPropagator.mapping @@ -1,4 +1,4 @@ -CLASS net/minecraft/class_4079 net/minecraft/util/SectionDistanceLevelPropagator +CLASS net/minecraft/class_4079 net/minecraft/world/SectionDistanceLevelPropagator METHOD method_18749 getInitialLevel (J)I ARG 1 id METHOD method_18750 update (JIZ)V