mirrors/yarn
mirrors
/
yarn
mirror of https://github.com/FabricMC/yarn.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

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>
This commit is contained in:
­Sollace 2020-03-18 01:04:34 +02:00 committed by GitHub
parent 5f5d0a8746
commit 93701715c0
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
36 changed files with 84 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
mappings/net/minecraft/util/BoundedIntUnaryOperator.mapping → mappings/net/minecraft/loot/operator/BoundedIntUnaryOperator.mapping
View File

@ -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 <init> (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

2
mappings/net/minecraft/util/PacketByteBuf.mapping → mappings/net/minecraft/network/PacketByteBuf.mapping
View File

@ -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;

1
mappings/net/minecraft/util/DebugPrintStreamLogger.mapping
View File

@ -1 +0,0 @@
CLASS net/minecraft/class_2980 net/minecraft/util/DebugPrintStreamLogger

8
mappings/net/minecraft/util/Identifier.mapping
View File

@ -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

3
mappings/net/minecraft/util/IndexedIterable.mapping
View File

@ -1,3 +0,0 @@
CLASS net/minecraft/class_2359 net/minecraft/util/IndexedIterable
METHOD method_10200 get (I)Ljava/lang/Object;
ARG 1 index

2
mappings/net/minecraft/util/LowercaseMap.mapping
View File

@ -1,2 +0,0 @@
CLASS net/minecraft/class_3522 net/minecraft/util/LowercaseMap
FIELD field_15666 delegate Ljava/util/Map;

2
mappings/net/minecraft/util/UncaughtExceptionHandler.mapping
View File

@ -1,2 +0,0 @@
CLASS net/minecraft/class_143 net/minecraft/util/UncaughtExceptionHandler
FIELD field_1115 logger Lorg/apache/logging/log4j/Logger;

2
mappings/net/minecraft/util/UncaughtExceptionLogger.mapping
View File

@ -1,2 +0,0 @@
CLASS net/minecraft/class_140 net/minecraft/util/UncaughtExceptionLogger
FIELD field_1113 logger Lorg/apache/logging/log4j/Logger;

4
mappings/net/minecraft/util/UserCache.mapping
View File

@ -10,6 +10,7 @@ CLASS net/minecraft/class_3312 net/minecraft/util/UserCache
FIELD field_14318 gson Lcom/google/gson/Gson;
METHOD <init> (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 <init> (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

2
mappings/net/minecraft/util/DefaultedList.mapping → mappings/net/minecraft/util/collection/DefaultedList.mapping
View File

@ -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 <init> (Ljava/util/List;Ljava/lang/Object;)V

7
mappings/net/minecraft/util/IdList.mapping → mappings/net/minecraft/util/collection/IdList.mapping
View File

@ -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 <init> (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

3
mappings/net/minecraft/util/collection/IndexedIterable.mapping Normal file
View File

@ -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

14
mappings/net/minecraft/util/Int2ObjectBiMap.mapping → mappings/net/minecraft/util/collection/Int2ObjectBiMap.mapping
View File

@ -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 <init> (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

2
mappings/net/minecraft/util/collection/LowercaseMap.mapping Normal file
View File

@ -0,0 +1,2 @@
CLASS net/minecraft/class_3522 net/minecraft/util/collection/LowercaseMap
FIELD field_15666 delegate Ljava/util/Map;

2
mappings/net/minecraft/util/MapUtil.mapping → mappings/net/minecraft/util/collection/MapUtil.mapping
View File

@ -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

2
mappings/net/minecraft/util/PackedIntegerArray.mapping → mappings/net/minecraft/util/collection/PackedIntegerArray.mapping
View File

@ -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

3
mappings/net/minecraft/util/ReusableStream.mapping → mappings/net/minecraft/util/collection/ReusableStream.mapping
View File

@ -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 <init> (Ljava/util/stream/Stream;)V

2
mappings/net/minecraft/util/SortedArraySet.mapping → mappings/net/minecraft/util/collection/SortedArraySet.mapping
View File

@ -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

2
mappings/net/minecraft/util/TypeFilterableList.mapping → mappings/net/minecraft/util/collection/TypeFilterableList.mapping
View File

@ -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;

2
mappings/net/minecraft/util/WeightedList.mapping → mappings/net/minecraft/util/collection/WeightedList.mapping
View File

@ -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;

2
mappings/net/minecraft/util/WeightedPicker.mapping → mappings/net/minecraft/util/collection/WeightedPicker.mapping
View File

@ -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

2
mappings/net/minecraft/util/DynamicDeserializer.mapping → mappings/net/minecraft/util/dynamic/DynamicDeserializer.mapping
View File

@ -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

2
mappings/net/minecraft/util/DynamicSerializable.mapping → mappings/net/minecraft/util/dynamic/DynamicSerializable.mapping
View File

@ -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

4
mappings/net/minecraft/util/DynamicSerializableBoolean.mapping → mappings/net/minecraft/util/dynamic/DynamicSerializableBoolean.mapping
View File

@ -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 <init> (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;

2
mappings/net/minecraft/util/DynamicSerializableUuid.mapping → mappings/net/minecraft/util/dynamic/DynamicSerializableUuid.mapping
View File

@ -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 <init> (Ljava/util/UUID;)V
ARG 1 uuid

2
mappings/net/minecraft/util/Timestamp.mapping → mappings/net/minecraft/util/dynamic/Timestamp.mapping
View File

@ -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 <init> (J)V
ARG 1 time

2
mappings/net/minecraft/util/BooleanBiFunction.mapping → mappings/net/minecraft/util/function/BooleanBiFunction.mapping
View File

@ -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;

2
mappings/net/minecraft/util/MaterialPredicate.mapping → mappings/net/minecraft/util/function/MaterialPredicate.mapping
View File

@ -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;

1
mappings/net/minecraft/util/logging/DebugPrintStreamLogger.mapping Normal file
View File

@ -0,0 +1 @@
CLASS net/minecraft/class_2980 net/minecraft/util/logging/DebugPrintStreamLogger

5
mappings/net/minecraft/util/PrintStreamLogger.mapping → mappings/net/minecraft/util/logging/PrintStreamLogger.mapping
View File

@ -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 <init> (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

2
mappings/net/minecraft/util/logging/UncaughtExceptionHandler.mapping Normal file
View File

@ -0,0 +1,2 @@
CLASS net/minecraft/class_143 net/minecraft/util/logging/UncaughtExceptionHandler
FIELD field_1115 logger Lorg/apache/logging/log4j/Logger;

2
mappings/net/minecraft/util/logging/UncaughtExceptionLogger.mapping Normal file
View File

@ -0,0 +1,2 @@
CLASS net/minecraft/class_140 net/minecraft/util/logging/UncaughtExceptionLogger
FIELD field_1113 logger Lorg/apache/logging/log4j/Logger;

6
mappings/net/minecraft/util/CsvWriter.mapping → mappings/net/minecraft/util/profiler/CsvWriter.mapping
View File

@ -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 <init> (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

2
mappings/net/minecraft/util/TickTimeTracker.mapping → mappings/net/minecraft/util/profiler/TickTimeTracker.mapping
View File

@ -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;

2
mappings/net/minecraft/util/OffsetDoubleList.mapping → mappings/net/minecraft/util/shape/OffsetDoubleList.mapping
View File

@ -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 <init> (Lit/unimi/dsi/fastutil/doubles/DoubleList;D)V

2
mappings/net/minecraft/util/SectionDistanceLevelPropagator.mapping → mappings/net/minecraft/world/SectionDistanceLevelPropagator.mapping
View File

@ -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