From 553ad17e3c2bb5534a8589e1426bb839a19317cd Mon Sep 17 00:00:00 2001 From: YanisBft Date: Sun, 3 Jan 2021 21:53:34 +0100 Subject: [PATCH] Random stuff (#1947) --- mappings/net/minecraft/entity/mob/MobEntity.mapping | 2 +- mappings/net/minecraft/state/State.mapping | 2 +- .../minecraft/util/collection/WeightedPicker.mapping | 2 ++ .../util/dynamic/RegistryElementCodec.mapping | 12 +++++++++++- mappings/net/minecraft/util/math/Vec3i.mapping | 1 + .../util/registry/BuiltinRegistries.mapping | 3 +++ .../util/registry/DynamicRegistryManager.mapping | 4 ++++ .../minecraft/util/registry/MutableRegistry.mapping | 2 ++ mappings/net/minecraft/world/ChunkSerializer.mapping | 6 ++++++ mappings/net/minecraft/world/World.mapping | 2 +- .../minecraft/world/biome/source/BiomeAccess.mapping | 4 ++-- mappings/net/minecraft/world/chunk/Chunk.mapping | 2 ++ .../minecraft/world/chunk/ChunkNibbleArray.mapping | 7 ++++++- .../net/minecraft/world/chunk/ChunkSection.mapping | 3 +++ .../world/chunk/ColumnChunkNibbleArray.mapping | 3 +++ .../minecraft/world/chunk/PalettedContainer.mapping | 4 ++++ .../net/minecraft/world/gen/GeneratorOptions.mapping | 3 +++ .../world/level/UnmodifiableLevelProperties.mapping | 6 +++++- 18 files changed, 60 insertions(+), 8 deletions(-) diff --git a/mappings/net/minecraft/entity/mob/MobEntity.mapping b/mappings/net/minecraft/entity/mob/MobEntity.mapping index 8ff50f4c9a..dfbaf90b03 100644 --- a/mappings/net/minecraft/entity/mob/MobEntity.mapping +++ b/mappings/net/minecraft/entity/mob/MobEntity.mapping @@ -73,7 +73,7 @@ CLASS net/minecraft/class_1308 net/minecraft/entity/mob/MobEntity METHOD method_26323 movesIndependently ()Z COMMENT When true, causes this entity to take over pathfinding for its controlling passenger. METHOD method_26828 createMobAttributes ()Lnet/minecraft/class_5132$class_5133; - METHOD method_29506 interactMobPrivate (Lnet/minecraft/class_1657;Lnet/minecraft/class_1268;)Lnet/minecraft/class_1269; + METHOD method_29506 interactWithItem (Lnet/minecraft/class_1657;Lnet/minecraft/class_1268;)Lnet/minecraft/class_1269; ARG 1 player ARG 2 hand METHOD method_30758 enchantEquipment (FLnet/minecraft/class_1304;)V diff --git a/mappings/net/minecraft/state/State.mapping b/mappings/net/minecraft/state/State.mapping index de9ed29b8a..047a8bd3b4 100644 --- a/mappings/net/minecraft/state/State.mapping +++ b/mappings/net/minecraft/state/State.mapping @@ -28,7 +28,7 @@ CLASS net/minecraft/class_2688 net/minecraft/state/State METHOD method_28499 toMapWith (Lnet/minecraft/class_2769;Ljava/lang/Comparable;)Ljava/util/Map; ARG 1 property ARG 2 value - METHOD method_28500 (Lnet/minecraft/class_2769;)Ljava/util/Optional; + METHOD method_28500 getOrEmpty (Lnet/minecraft/class_2769;)Ljava/util/Optional; ARG 1 property METHOD method_28501 getProperties ()Ljava/util/Collection; CLASS 1 diff --git a/mappings/net/minecraft/util/collection/WeightedPicker.mapping b/mappings/net/minecraft/util/collection/WeightedPicker.mapping index 5e86df1af0..04f762baec 100644 --- a/mappings/net/minecraft/util/collection/WeightedPicker.mapping +++ b/mappings/net/minecraft/util/collection/WeightedPicker.mapping @@ -13,3 +13,5 @@ CLASS net/minecraft/class_3549 net/minecraft/util/collection/WeightedPicker ARG 1 weightMark CLASS class_3550 Entry FIELD field_15774 weight I + METHOD (I)V + ARG 1 weight diff --git a/mappings/net/minecraft/util/dynamic/RegistryElementCodec.mapping b/mappings/net/minecraft/util/dynamic/RegistryElementCodec.mapping index 8f193f47ce..957e5c87c5 100644 --- a/mappings/net/minecraft/util/dynamic/RegistryElementCodec.mapping +++ b/mappings/net/minecraft/util/dynamic/RegistryElementCodec.mapping @@ -12,8 +12,11 @@ CLASS net/minecraft/class_5381 net/minecraft/util/dynamic/RegistryElementCodec COMMENT @see RegistryOps FIELD field_25507 registryRef Lnet/minecraft/class_5321; FIELD field_25508 elementCodec Lcom/mojang/serialization/Codec; + FIELD field_26758 allowInlineDefinitions Z METHOD (Lnet/minecraft/class_5321;Lcom/mojang/serialization/Codec;Z)V ARG 1 registryRef + ARG 2 elementCodec + ARG 3 allowInlineDefinitions METHOD decode (Lcom/mojang/serialization/DynamicOps;Ljava/lang/Object;)Lcom/mojang/serialization/DataResult; ARG 1 ops ARG 2 input @@ -23,4 +26,11 @@ CLASS net/minecraft/class_5381 net/minecraft/util/dynamic/RegistryElementCodec ARG 3 prefix METHOD method_29749 of (Lnet/minecraft/class_5321;Lcom/mojang/serialization/Codec;)Lnet/minecraft/class_5381; ARG 0 registryRef - ARG 1 codec + ARG 1 elementCodec + METHOD method_31192 of (Lnet/minecraft/class_5321;Lcom/mojang/serialization/Codec;Z)Lnet/minecraft/class_5381; + ARG 0 registryRef + ARG 1 elementCodec + ARG 2 allowInlineDefinitions + METHOD method_31194 (Lnet/minecraft/class_5321;Lcom/mojang/serialization/Codec;)Lcom/mojang/serialization/Codec; + ARG 0 registryRef + ARG 1 elementCodec diff --git a/mappings/net/minecraft/util/math/Vec3i.mapping b/mappings/net/minecraft/util/math/Vec3i.mapping index 7fe5ba88af..30652eb1cb 100644 --- a/mappings/net/minecraft/util/math/Vec3i.mapping +++ b/mappings/net/minecraft/util/math/Vec3i.mapping @@ -50,6 +50,7 @@ CLASS net/minecraft/class_2382 net/minecraft/util/math/Vec3i METHOD method_23228 down ()Lnet/minecraft/class_2382; METHOD method_23854 toShortString ()Ljava/lang/String; METHOD method_30558 getComponentAlongAxis (Lnet/minecraft/class_2350$class_2351;)I + ARG 1 axis METHOD method_30930 up (I)Lnet/minecraft/class_2382; ARG 1 distance METHOD method_30931 up ()Lnet/minecraft/class_2382; diff --git a/mappings/net/minecraft/util/registry/BuiltinRegistries.mapping b/mappings/net/minecraft/util/registry/BuiltinRegistries.mapping index 13435d066c..fb8d1ece90 100644 --- a/mappings/net/minecraft/util/registry/BuiltinRegistries.mapping +++ b/mappings/net/minecraft/util/registry/BuiltinRegistries.mapping @@ -15,7 +15,9 @@ CLASS net/minecraft/class_5458 net/minecraft/util/registry/BuiltinRegistries FIELD field_26375 CHUNK_GENERATOR_SETTINGS Lnet/minecraft/class_2378; METHOD method_30559 init ()V METHOD method_30560 set (Lnet/minecraft/class_2378;ILnet/minecraft/class_5321;Ljava/lang/Object;)Ljava/lang/Object; + ARG 0 registry ARG 1 rawId + ARG 2 key ARG 3 object METHOD method_30561 add (Lnet/minecraft/class_2378;Ljava/lang/String;Ljava/lang/Object;)Ljava/lang/Object; ARG 0 registry @@ -33,6 +35,7 @@ CLASS net/minecraft/class_5458 net/minecraft/util/registry/BuiltinRegistries ARG 0 registryRef ARG 1 registry ARG 2 defaultValueSupplier + ARG 3 lifecycle METHOD method_30565 addRegistry (Lnet/minecraft/class_5321;Ljava/util/function/Supplier;)Lnet/minecraft/class_2378; ARG 0 registryRef ARG 1 defaultValueSupplier diff --git a/mappings/net/minecraft/util/registry/DynamicRegistryManager.mapping b/mappings/net/minecraft/util/registry/DynamicRegistryManager.mapping index 3c7211f413..d0a99056b8 100644 --- a/mappings/net/minecraft/util/registry/DynamicRegistryManager.mapping +++ b/mappings/net/minecraft/util/registry/DynamicRegistryManager.mapping @@ -51,6 +51,10 @@ CLASS net/minecraft/class_5455 net/minecraft/util/registry/DynamicRegistryManage ARG 1 registryRef ARG 2 entryCodec ARG 3 networkEntryCodec + METHOD method_31141 (Lnet/minecraft/class_5455$class_5457;Lnet/minecraft/class_5382$class_5506$class_5507;Lnet/minecraft/class_5455$class_5456;)V + ARG 0 registryManager + ARG 1 entryLoader + ARG 2 info METHOD method_33309 getMutable (Lnet/minecraft/class_5321;)Lnet/minecraft/class_2385; ARG 1 key METHOD method_33310 getOptional (Lnet/minecraft/class_5321;)Ljava/util/Optional; diff --git a/mappings/net/minecraft/util/registry/MutableRegistry.mapping b/mappings/net/minecraft/util/registry/MutableRegistry.mapping index 4368fc6579..63663daaed 100644 --- a/mappings/net/minecraft/util/registry/MutableRegistry.mapping +++ b/mappings/net/minecraft/util/registry/MutableRegistry.mapping @@ -7,6 +7,7 @@ CLASS net/minecraft/class_2385 net/minecraft/util/registry/MutableRegistry ARG 1 rawId ARG 2 key ARG 3 entry + ARG 4 lifecycle METHOD method_31062 replace (Ljava/util/OptionalInt;Lnet/minecraft/class_5321;Ljava/lang/Object;Lcom/mojang/serialization/Lifecycle;)Ljava/lang/Object; COMMENT If the given key is already present in the registry, replaces the entry associated with the given COMMENT key with the new entry. This method asserts that the raw ID is equal to the value already in @@ -18,3 +19,4 @@ CLASS net/minecraft/class_2385 net/minecraft/util/registry/MutableRegistry ARG 1 rawId ARG 2 key ARG 3 newEntry + ARG 4 lifecycle diff --git a/mappings/net/minecraft/world/ChunkSerializer.mapping b/mappings/net/minecraft/world/ChunkSerializer.mapping index b80b19b735..97e5f25acc 100644 --- a/mappings/net/minecraft/world/ChunkSerializer.mapping +++ b/mappings/net/minecraft/world/ChunkSerializer.mapping @@ -9,12 +9,16 @@ CLASS net/minecraft/class_2852 net/minecraft/world/ChunkSerializer ARG 1 structureStarts ARG 2 structureReferences METHOD method_12386 writeEntities (Lnet/minecraft/class_3218;Lnet/minecraft/class_2487;Lnet/minecraft/class_2818;)V + ARG 0 world + ARG 1 tag + ARG 2 chunk METHOD method_12387 readStructureReferences (Lnet/minecraft/class_1923;Lnet/minecraft/class_2487;)Ljava/util/Map; ARG 0 pos ARG 1 tag METHOD method_12391 (Lnet/minecraft/class_3611;)Z ARG 0 fluid METHOD method_12392 readStructureStarts (Lnet/minecraft/class_3485;Lnet/minecraft/class_2487;J)Ljava/util/Map; + ARG 0 structureManager ARG 1 tag ARG 2 worldSeed METHOD method_12393 toNbt ([Lit/unimi/dsi/fastutil/shorts/ShortList;)Lnet/minecraft/class_2499; @@ -30,3 +34,5 @@ CLASS net/minecraft/class_2852 net/minecraft/world/ChunkSerializer METHOD method_12410 serialize (Lnet/minecraft/class_3218;Lnet/minecraft/class_2791;)Lnet/minecraft/class_2487; ARG 0 world ARG 1 chunk + METHOD method_24029 (Lnet/minecraft/class_1923;Ljava/lang/String;J)Z + ARG 2 packedPos diff --git a/mappings/net/minecraft/world/World.mapping b/mappings/net/minecraft/world/World.mapping index de60502f4e..24f4cdf7ce 100644 --- a/mappings/net/minecraft/world/World.mapping +++ b/mappings/net/minecraft/world/World.mapping @@ -79,7 +79,7 @@ CLASS net/minecraft/class_1937 net/minecraft/world/World COMMENT

Debug worlds are not modifiable and are typically meant for development and debug use only. COMMENT See the minecraft wiki as well. METHOD method_27983 getRegistryKey ()Lnet/minecraft/class_5321; - METHOD method_31592 getEntityManager ()Lnet/minecraft/class_5577; + METHOD method_31592 getEntityIdMap ()Lnet/minecraft/class_5577; METHOD method_31594 addBlockEntityTicker (Lnet/minecraft/class_5562;)V METHOD method_31595 addBlockBreakParticles (Lnet/minecraft/class_2338;Lnet/minecraft/class_2680;)V ARG 1 pos diff --git a/mappings/net/minecraft/world/biome/source/BiomeAccess.mapping b/mappings/net/minecraft/world/biome/source/BiomeAccess.mapping index eeb8415331..890190b634 100644 --- a/mappings/net/minecraft/world/biome/source/BiomeAccess.mapping +++ b/mappings/net/minecraft/world/biome/source/BiomeAccess.mapping @@ -14,11 +14,11 @@ CLASS net/minecraft/class_4543 net/minecraft/world/biome/source/BiomeAccess ARG 1 biomeX ARG 2 biomeY ARG 3 biomeZ - METHOD method_24938 getBiome (DDD)Lnet/minecraft/class_1959; + METHOD method_24938 getBiomeForNoiseGen (DDD)Lnet/minecraft/class_1959; ARG 1 x ARG 3 y ARG 5 z - METHOD method_27344 (Lnet/minecraft/class_2338;)Lnet/minecraft/class_1959; + METHOD method_27344 getBiomeForNoiseGen (Lnet/minecraft/class_2338;)Lnet/minecraft/class_1959; ARG 1 pos METHOD method_27984 hashSeed (J)J ARG 0 seed diff --git a/mappings/net/minecraft/world/chunk/Chunk.mapping b/mappings/net/minecraft/world/chunk/Chunk.mapping index 89807cd406..1b8e0ef019 100644 --- a/mappings/net/minecraft/world/chunk/Chunk.mapping +++ b/mappings/net/minecraft/world/chunk/Chunk.mapping @@ -35,6 +35,8 @@ CLASS net/minecraft/class_2791 net/minecraft/world/chunk/Chunk METHOD method_12028 setInhabitedTime (J)V ARG 1 inhabitedTime METHOD method_12029 markBlockForPostProcessing (SI)V + ARG 1 packedPos + ARG 2 index METHOD method_12031 getHighestNonEmptySectionYOffset ()I METHOD method_12032 getHeightmap (Lnet/minecraft/class_2902$class_2903;)Lnet/minecraft/class_2902; ARG 1 type diff --git a/mappings/net/minecraft/world/chunk/ChunkNibbleArray.mapping b/mappings/net/minecraft/world/chunk/ChunkNibbleArray.mapping index d33ccb8a0d..ddb1f46aed 100644 --- a/mappings/net/minecraft/world/chunk/ChunkNibbleArray.mapping +++ b/mappings/net/minecraft/world/chunk/ChunkNibbleArray.mapping @@ -1,5 +1,9 @@ CLASS net/minecraft/class_2804 net/minecraft/world/chunk/ChunkNibbleArray - FIELD field_12783 byteArray [B + FIELD field_12783 bytes [B + METHOD (I)V + ARG 1 size + METHOD ([B)V + ARG 1 bytes METHOD method_12137 asByteArray ()[B METHOD method_12138 divideByTwo (I)I ARG 1 n @@ -12,6 +16,7 @@ CLASS net/minecraft/class_2804 net/minecraft/world/chunk/ChunkNibbleArray ARG 2 y ARG 3 z METHOD method_12141 get (I)I + ARG 1 index METHOD method_12142 set (II)V ARG 1 index ARG 2 value diff --git a/mappings/net/minecraft/world/chunk/ChunkSection.mapping b/mappings/net/minecraft/world/chunk/ChunkSection.mapping index 091370a7c7..2a46f6bb86 100644 --- a/mappings/net/minecraft/world/chunk/ChunkSection.mapping +++ b/mappings/net/minecraft/world/chunk/ChunkSection.mapping @@ -46,3 +46,6 @@ CLASS net/minecraft/class_2826 net/minecraft/world/chunk/ChunkSection METHOD method_18090 isEmpty (Lnet/minecraft/class_2826;)Z ARG 0 section METHOD method_19523 hasAny (Ljava/util/function/Predicate;)Z + METHOD method_21731 (Lnet/minecraft/class_2680;I)V + ARG 1 state + ARG 2 count diff --git a/mappings/net/minecraft/world/chunk/ColumnChunkNibbleArray.mapping b/mappings/net/minecraft/world/chunk/ColumnChunkNibbleArray.mapping index 689f53194e..3413f7b79e 100644 --- a/mappings/net/minecraft/world/chunk/ColumnChunkNibbleArray.mapping +++ b/mappings/net/minecraft/world/chunk/ColumnChunkNibbleArray.mapping @@ -1 +1,4 @@ CLASS net/minecraft/class_4298 net/minecraft/world/chunk/ColumnChunkNibbleArray + METHOD (Lnet/minecraft/class_2804;I)V + ARG 1 chunkNibbleArray + ARG 2 offset diff --git a/mappings/net/minecraft/world/chunk/PalettedContainer.mapping b/mappings/net/minecraft/world/chunk/PalettedContainer.mapping index 551c741fd2..1b610a45b5 100644 --- a/mappings/net/minecraft/world/chunk/PalettedContainer.mapping +++ b/mappings/net/minecraft/world/chunk/PalettedContainer.mapping @@ -20,6 +20,7 @@ CLASS net/minecraft/class_2841 net/minecraft/world/chunk/PalettedContainer ARG 2 y ARG 3 z METHOD method_12322 set (ILjava/lang/Object;)V + ARG 1 index METHOD method_12323 toIndex (III)I ARG 0 x ARG 1 y @@ -40,6 +41,9 @@ CLASS net/minecraft/class_2841 net/minecraft/world/chunk/PalettedContainer ARG 1 paletteTag ARG 2 data METHOD method_12330 write (Lnet/minecraft/class_2487;Ljava/lang/String;Ljava/lang/String;)V + ARG 1 tag + ARG 2 paletteKey + ARG 3 dataKey METHOD method_12331 get (I)Ljava/lang/Object; ARG 1 index METHOD method_12332 (Ljava/lang/Thread;)Ljava/lang/String; diff --git a/mappings/net/minecraft/world/gen/GeneratorOptions.mapping b/mappings/net/minecraft/world/gen/GeneratorOptions.mapping index aef6eb356c..ee26605c6f 100644 --- a/mappings/net/minecraft/world/gen/GeneratorOptions.mapping +++ b/mappings/net/minecraft/world/gen/GeneratorOptions.mapping @@ -10,10 +10,12 @@ CLASS net/minecraft/class_5285 net/minecraft/world/gen/GeneratorOptions ARG 1 seed ARG 3 generateStructures ARG 4 bonusChest + ARG 5 options METHOD (JZZLnet/minecraft/class_2370;Ljava/util/Optional;)V ARG 1 seed ARG 3 generateStructures ARG 4 bonusChest + ARG 5 options ARG 6 legacyCustomOptions METHOD method_28009 getDefaultOptions (Lnet/minecraft/class_2378;Lnet/minecraft/class_2378;Lnet/minecraft/class_2378;)Lnet/minecraft/class_5285; METHOD method_28021 fromProperties (Lnet/minecraft/class_5455;Ljava/util/Properties;)Lnet/minecraft/class_5285; @@ -35,4 +37,5 @@ CLASS net/minecraft/class_5285 net/minecraft/world/gen/GeneratorOptions ARG 1 chunkGeneratorSettingsRegistry ARG 2 seed METHOD method_28609 getDimensions ()Lnet/minecraft/class_2370; + METHOD method_28611 isStable ()Z METHOD method_29575 getWorlds ()Lcom/google/common/collect/ImmutableSet; diff --git a/mappings/net/minecraft/world/level/UnmodifiableLevelProperties.mapping b/mappings/net/minecraft/world/level/UnmodifiableLevelProperties.mapping index a33148f061..14c2ad7ec4 100644 --- a/mappings/net/minecraft/world/level/UnmodifiableLevelProperties.mapping +++ b/mappings/net/minecraft/world/level/UnmodifiableLevelProperties.mapping @@ -1,2 +1,6 @@ CLASS net/minecraft/class_27 net/minecraft/world/level/UnmodifiableLevelProperties - FIELD field_139 properties Lnet/minecraft/class_5268; + FIELD field_139 worldProperties Lnet/minecraft/class_5268; + FIELD field_24179 saveProperties Lnet/minecraft/class_5219; + METHOD (Lnet/minecraft/class_5219;Lnet/minecraft/class_5268;)V + ARG 1 saveProperties + ARG 2 worldProperties