Util package stuff (#1994)

* util stuff

* Apply suggestions from code review

Co-authored-by: Juuxel <6596629+Juuxel@users.noreply.github.com>

* Update mappings/net/minecraft/util/BlockMirror.mapping

Co-authored-by: Juuxel <6596629+Juuxel@users.noreply.github.com>

* Update Identifier.mapping

Co-authored-by: Juuxel <6596629+Juuxel@users.noreply.github.com>
This commit is contained in:
Shnupbups 2021-02-03 04:57:50 +11:00 committed by GitHub
parent f14d7b8110
commit 4f69f09764
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
22 changed files with 73 additions and 0 deletions

View File

@ -1,5 +1,9 @@
CLASS net/minecraft/class_2415 net/minecraft/util/BlockMirror
FIELD field_23263 directionTransformation Lnet/minecraft/class_4990;
FIELD field_27883 name Lnet/minecraft/class_2561;
METHOD <init> (Ljava/lang/String;ILnet/minecraft/class_2561;Lnet/minecraft/class_4990;)V
ARG 3 name
ARG 4 directionTransformation
METHOD method_10343 apply (Lnet/minecraft/class_2350;)Lnet/minecraft/class_2350;
ARG 1 direction
METHOD method_10344 mirror (II)I
@ -8,3 +12,4 @@ CLASS net/minecraft/class_2415 net/minecraft/util/BlockMirror
METHOD method_10345 getRotation (Lnet/minecraft/class_2350;)Lnet/minecraft/class_2470;
ARG 1 direction
METHOD method_26380 getDirectionTransformation ()Lnet/minecraft/class_4990;
METHOD method_32354 getName ()Lnet/minecraft/class_2561;

View File

@ -8,6 +8,7 @@ CLASS net/minecraft/class_4239 net/minecraft/util/FileNameUtil
METHOD method_20200 isNormal (Ljava/nio/file/Path;)Z
ARG 0 path
METHOD method_20201 isAllowedName (Ljava/nio/file/Path;)Z
ARG 0 path
METHOD method_20202 getResourcePath (Ljava/nio/file/Path;Ljava/lang/String;Ljava/lang/String;)Ljava/nio/file/Path;
ARG 0 path
ARG 1 resourceName

View File

@ -15,6 +15,10 @@ CLASS net/minecraft/class_2960 net/minecraft/util/Identifier
ARG 2 path
METHOD <init> ([Ljava/lang/String;)V
ARG 1 id
METHOD compareTo (Ljava/lang/Object;)I
ARG 1 other
METHOD equals (Ljava/lang/Object;)Z
ARG 1 other
METHOD method_12829 tryParse (Ljava/lang/String;)Lnet/minecraft/class_2960;
COMMENT <p>Parses a string into an {@code Identifier}.</p>
COMMENT Takes a string of the form {@code <namespace>:<path>}, for example {@code minecraft:iron_ingot}.
@ -39,7 +43,11 @@ CLASS net/minecraft/class_2960 net/minecraft/util/Identifier
METHOD method_20209 isNamespaceValid (Ljava/lang/String;)Z
ARG 0 namespace
METHOD method_29184 isPathCharacterValid (C)Z
ARG 0 character
METHOD method_29185 isNamespaceCharacterValid (C)Z
ARG 0 character
METHOD method_29186 validate (Ljava/lang/String;)Lcom/mojang/serialization/DataResult;
ARG 0 id
CLASS class_2961 Serializer
METHOD deserialize (Lcom/google/gson/JsonElement;Ljava/lang/reflect/Type;Lcom/google/gson/JsonDeserializationContext;)Ljava/lang/Object;
ARG 1 json

View File

@ -37,6 +37,8 @@ CLASS net/minecraft/class_5330 net/minecraft/util/JsonSerializing
FIELD field_25200 typeIdentification Ljava/util/function/Function;
FIELD field_25201 elementSerializer Lcom/mojang/datafixers/util/Pair;
METHOD <init> (Lnet/minecraft/class_2378;Ljava/lang/String;Ljava/lang/String;Ljava/util/function/Function;Lnet/minecraft/class_5336;Lcom/mojang/datafixers/util/Pair;)V
ARG 1 registry
ARG 2 rootFieldName
ARG 3 idFieldName
ARG 4 typeIdentification
ARG 6 elementSerializer

View File

@ -16,8 +16,10 @@ CLASS net/minecraft/class_3312 net/minecraft/util/UserCache
METHOD method_14510 setUseRemote (Z)V
ARG 0 value
METHOD method_14512 getByUuid (Ljava/util/UUID;)Lcom/mojang/authlib/GameProfile;
ARG 1 uuid
METHOD method_14514 shouldUseRemote ()Z
METHOD method_14515 findByName (Ljava/lang/String;)Lcom/mojang/authlib/GameProfile;
ARG 1 name
METHOD method_14516 getLastAccessedEntries (I)Ljava/util/stream/Stream;
METHOD method_14517 load ()Ljava/util/List;
METHOD method_14518 save ()V

View File

@ -1,4 +1,5 @@
CLASS net/minecraft/class_3549 net/minecraft/util/collection/WeightedPicker
FIELD field_28398 LOGGER Lorg/apache/logging/log4j/Logger;
METHOD method_15444 getRandom (Ljava/util/Random;Ljava/util/List;I)Ljava/util/Optional;
ARG 0 random
ARG 1 list

View File

@ -16,12 +16,25 @@ CLASS net/minecraft/class_129 net/minecraft/util/crash/CrashReportSection
METHOD method_580 trimStackTraceEnd (I)V
ARG 1 callCount
METHOD method_581 createPositionString (Lnet/minecraft/class_5539;III)Ljava/lang/String;
ARG 0 world
ARG 1 x
ARG 2 y
ARG 3 z
METHOD method_582 createPositionString (Lnet/minecraft/class_5539;Lnet/minecraft/class_2338;)Ljava/lang/String;
ARG 0 world
ARG 1 pos
METHOD method_583 createPositionString (Lnet/minecraft/class_5539;DDD)Ljava/lang/String;
ARG 0 world
ARG 1 x
ARG 3 y
ARG 5 z
METHOD method_585 add (Ljava/lang/String;Ljava/lang/Throwable;)V
ARG 1 name
METHOD method_586 addBlockInfo (Lnet/minecraft/class_129;Lnet/minecraft/class_5539;Lnet/minecraft/class_2338;Lnet/minecraft/class_2680;)V
ARG 0 element
ARG 1 world
ARG 2 pos
ARG 3 state
CLASS class_130 Element
FIELD field_1098 name Ljava/lang/String;
FIELD field_1099 detail Ljava/lang/String;

View File

@ -6,9 +6,13 @@ CLASS net/minecraft/class_5382 net/minecraft/util/dynamic/RegistryOps
FIELD field_26739 entryOps Lnet/minecraft/class_5382;
METHOD <init> (Lcom/mojang/serialization/DynamicOps;Lnet/minecraft/class_5382$class_5506;Lnet/minecraft/class_5455$class_5457;Ljava/util/IdentityHashMap;)V
ARG 1 delegate
ARG 2 entryLoader
ARG 3 registryManager
ARG 4 valueHolders
METHOD method_29753 of (Lcom/mojang/serialization/DynamicOps;Lnet/minecraft/class_3300;Lnet/minecraft/class_5455$class_5457;)Lnet/minecraft/class_5382;
ARG 0 delegate
ARG 1 resourceManager
ARG 2 registryManager
METHOD method_29755 loadToRegistry (Lnet/minecraft/class_2370;Lnet/minecraft/class_5321;Lcom/mojang/serialization/Codec;)Lcom/mojang/serialization/DataResult;
COMMENT Loads elements into a registry just loaded from a decoder.
ARG 1 registry
@ -28,10 +32,14 @@ CLASS net/minecraft/class_5382 net/minecraft/util/dynamic/RegistryOps
COMMENT <p>This logic is used by both {@code decodeOrId} and {@code loadToRegistry}.</p>
ARG 4 elementId
METHOD method_31150 of (Lcom/mojang/serialization/DynamicOps;Lnet/minecraft/class_5382$class_5506;Lnet/minecraft/class_5455$class_5457;)Lnet/minecraft/class_5382;
ARG 0 delegate
ARG 1 entryLoader
ARG 2 registryManager
CLASS class_5383 ValueHolder
FIELD field_25513 values Ljava/util/Map;
CLASS class_5506 EntryLoader
METHOD method_31154 resourceBacked (Lnet/minecraft/class_3300;)Lnet/minecraft/class_5382$class_5506;
ARG 0 resourceManager
METHOD method_31155 load (Lcom/mojang/serialization/DynamicOps;Lnet/minecraft/class_5321;Lnet/minecraft/class_5321;Lcom/mojang/serialization/Decoder;)Lcom/mojang/serialization/DataResult;
ARG 2 registryId
ARG 3 entryId
@ -43,4 +51,5 @@ CLASS net/minecraft/class_5382 net/minecraft/util/dynamic/RegistryOps
FIELD field_26742 entryToRawId Lit/unimi/dsi/fastutil/objects/Object2IntMap;
FIELD field_26743 entryToLifecycle Ljava/util/Map;
METHOD method_31159 add (Lnet/minecraft/class_5455$class_5457;Lnet/minecraft/class_5321;Lcom/mojang/serialization/Encoder;ILjava/lang/Object;Lcom/mojang/serialization/Lifecycle;)V
ARG 1 registryManager
ARG 4 rawId

View File

@ -6,3 +6,5 @@ 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/String;)V
ARG 1 message

View File

@ -1,2 +1,4 @@
CLASS net/minecraft/class_140 net/minecraft/util/logging/UncaughtExceptionLogger
FIELD field_1113 logger Lorg/apache/logging/log4j/Logger;
METHOD <init> (Lorg/apache/logging/log4j/Logger;)V
ARG 1 logger

View File

@ -99,6 +99,8 @@ CLASS net/minecraft/class_4076 net/minecraft/util/math/ChunkSectionPos
METHOD method_22446 stream (Lnet/minecraft/class_1923;III)Ljava/util/stream/Stream;
ARG 0 center
ARG 1 radius
ARG 2 minY
ARG 3 maxY
METHOD method_30551 unpackLocalX (S)I
COMMENT Gets the local x-coordinate from the given packed local position.
COMMENT @see #packLocal
@ -127,6 +129,8 @@ CLASS net/minecraft/class_4076 net/minecraft/util/math/ChunkSectionPos
COMMENT Gets the world position of the given local position within this chunk section.
COMMENT @see #packLocal
ARG 1 packedLocalPos
METHOD method_32204 getSectionCoord (D)I
ARG 0 coord
METHOD method_32205 getOffsetPos (II)I
ARG 0 chunkCoord
ARG 1 offset

View File

@ -115,5 +115,7 @@ CLASS net/minecraft/class_2350 net/minecraft/util/math/Direction
METHOD method_10183 random (Ljava/util/Random;)Lnet/minecraft/class_2350;
ARG 1 random
METHOD method_29716 stream ()Ljava/util/stream/Stream;
METHOD method_33465 randomAxis (Ljava/util/Random;)Lnet/minecraft/class_2350$class_2351;
ARG 1 random
METHOD test (Ljava/lang/Object;)Z
ARG 1 direction

View File

@ -4,6 +4,7 @@ CLASS net/minecraft/class_243 net/minecraft/util/math/Vec3d
FIELD field_1351 y D
FIELD field_1352 x D
FIELD field_1353 ZERO Lnet/minecraft/class_243;
FIELD field_28243 CODEC Lcom/mojang/serialization/Codec;
METHOD <init> (DDD)V
ARG 1 x
ARG 3 y
@ -55,6 +56,7 @@ CLASS net/minecraft/class_243 net/minecraft/util/math/Vec3d
METHOD method_1037 rotateX (F)Lnet/minecraft/class_243;
ARG 1 angle
METHOD method_18043 getComponentAlongAxis (Lnet/minecraft/class_2350$class_2351;)D
ARG 1 axis
METHOD method_18805 multiply (DDD)Lnet/minecraft/class_243;
ARG 1 multX
ARG 3 multY

View File

@ -9,6 +9,7 @@ CLASS net/minecraft/class_1160 net/minecraft/util/math/Vec3f
FIELD field_21483 x F
FIELD field_21484 y F
FIELD field_21485 z F
FIELD field_28477 CODEC Lcom/mojang/serialization/Codec;
METHOD <init> (FFF)V
ARG 1 x
ARG 2 y

View File

@ -3,4 +3,6 @@ CLASS net/minecraft/class_2348 net/minecraft/util/registry/DefaultedRegistry
FIELD field_11015 defaultValue Ljava/lang/Object;
METHOD <init> (Ljava/lang/String;Lnet/minecraft/class_5321;Lcom/mojang/serialization/Lifecycle;)V
ARG 1 defaultId
ARG 2 key
ARG 3 lifecycle
METHOD method_10137 getDefaultId ()Lnet/minecraft/class_2960;

View File

@ -14,6 +14,7 @@ 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$class_5457;Lnet/minecraft/class_5382;)V
COMMENT Loads a dynamic registry manager from the resource manager's data files.
ARG 0 registryManager
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

View File

@ -45,6 +45,8 @@ CLASS net/minecraft/class_5321 net/minecraft/util/registry/RegistryKey
METHOD method_29181 of (Lnet/minecraft/class_2960;Lnet/minecraft/class_2960;)Lnet/minecraft/class_5321;
ARG 0 registry
ARG 1 value
METHOD method_29183 (Lnet/minecraft/class_5321;Lnet/minecraft/class_2960;)Lnet/minecraft/class_5321;
ARG 1 id
METHOD method_31163 isOf (Lnet/minecraft/class_5321;)Z
COMMENT Returns whether this registry key belongs to the given registry (according to its type, not whether the registry actually contains this key).
ARG 1 registry

View File

@ -2,5 +2,7 @@ CLASS net/minecraft/class_5505 net/minecraft/util/registry/RegistryLookupCodec
FIELD field_26737 registryKey Lnet/minecraft/class_5321;
METHOD <init> (Lnet/minecraft/class_5321;)V
ARG 1 registryKey
METHOD encode (Ljava/lang/Object;Lcom/mojang/serialization/DynamicOps;Lcom/mojang/serialization/RecordBuilder;)Lcom/mojang/serialization/RecordBuilder;
ARG 1 registry
METHOD method_31148 of (Lnet/minecraft/class_5321;)Lnet/minecraft/class_5505;
ARG 0 registryKey

View File

@ -9,6 +9,7 @@ CLASS net/minecraft/class_2370 net/minecraft/util/registry/SimpleRegistry
FIELD field_26731 entryToLifecycle Ljava/util/Map;
FIELD field_26732 lifecycle Lcom/mojang/serialization/Lifecycle;
METHOD method_10240 getRandom (Ljava/util/Random;)Ljava/lang/Object;
ARG 1 random
METHOD method_29098 createRegistryManagerCodec (Lnet/minecraft/class_5321;Lcom/mojang/serialization/Lifecycle;Lcom/mojang/serialization/Codec;)Lcom/mojang/serialization/Codec;
ARG 2 entryCodec
METHOD method_29721 createRegistryCodec (Lnet/minecraft/class_5321;Lcom/mojang/serialization/Lifecycle;Lcom/mojang/serialization/Codec;)Lcom/mojang/serialization/Codec;
@ -21,8 +22,10 @@ CLASS net/minecraft/class_2370 net/minecraft/util/registry/SimpleRegistry
ARG 1 rawId
ARG 2 key
ARG 3 entry
ARG 4 lifecycle
ARG 5 checkDuplicateKeys
METHOD method_31059 createCodec (Lnet/minecraft/class_5321;Lcom/mojang/serialization/Lifecycle;Lcom/mojang/serialization/Codec;)Lcom/mojang/serialization/Codec;
ARG 1 lifecycle
ARG 2 entryCodec
CLASS class_5501 RegistryManagerEntry
FIELD field_26684 key Lnet/minecraft/class_5321;

View File

@ -8,4 +8,5 @@ CLASS net/minecraft/class_263 net/minecraft/util/shape/SlicedVoxelShape
ARG 3 sliceWidth
METHOD method_1088 createVoxelSet (Lnet/minecraft/class_251;Lnet/minecraft/class_2350$class_2351;I)Lnet/minecraft/class_251;
ARG 0 voxelSet
ARG 1 axis
ARG 2 sliceWidth

View File

@ -37,6 +37,7 @@ CLASS net/minecraft/class_251 net/minecraft/util/shape/VoxelSet
ARG 3 y
ARG 4 z
METHOD method_1058 getEndingAxisCoord (Lnet/minecraft/class_2350$class_2351;II)I
ARG 1 axis
ARG 2 from
ARG 3 to
METHOD method_1061 forEachDirection (Lnet/minecraft/class_251$class_252;Lnet/minecraft/class_2335;)V

View File

@ -99,6 +99,13 @@ CLASS net/minecraft/class_259 net/minecraft/util/shape/VoxelShapes
METHOD method_20713 unionCoversFullCube (Lnet/minecraft/class_265;Lnet/minecraft/class_265;)Z
ARG 0 one
ARG 1 two
METHOD method_31943 cuboidUnchecked (DDDDDD)Lnet/minecraft/class_265;
ARG 0 minX
ARG 2 minY
ARG 4 minZ
ARG 6 maxX
ARG 8 maxY
ARG 10 maxZ
CLASS class_260 BoxConsumer
METHOD consume (DDDDDD)V
ARG 1 minX