From bbf3086597cab2b3ccb0bb40abb931129300d412 Mon Sep 17 00:00:00 2001 From: YanisBft Date: Sun, 8 Nov 2020 15:35:59 +0100 Subject: [PATCH] Misc things (#1862) --- .../entity/model/EntityModelLayers.mapping | 2 +- .../minecraft/util/StringIdentifiable.mapping | 6 ++++++ .../util/collection/WeightedList.mapping | 4 ++-- .../net/minecraft/util/math/Matrix4f.mapping | 2 +- mappings/net/minecraft/world/World.mapping | 9 ++++++++- .../minecraft/world/biome/SpawnSettings.mapping | 2 +- .../minecraft/world/explosion/Explosion.mapping | 17 +++++++++++++++++ 7 files changed, 36 insertions(+), 6 deletions(-) diff --git a/mappings/net/minecraft/client/render/entity/model/EntityModelLayers.mapping b/mappings/net/minecraft/client/render/entity/model/EntityModelLayers.mapping index 150d907d9a..66969da3a3 100644 --- a/mappings/net/minecraft/client/render/entity/model/EntityModelLayers.mapping +++ b/mappings/net/minecraft/client/render/entity/model/EntityModelLayers.mapping @@ -46,7 +46,7 @@ CLASS net/minecraft/class_5602 net/minecraft/client/render/entity/model/EntityMo METHOD method_32076 getLayers ()Ljava/util/stream/Stream; METHOD method_32077 createBoat (Lnet/minecraft/class_1690$class_1692;)Lnet/minecraft/class_5601; ARG 0 type - METHOD method_32078 craftSign (Lnet/minecraft/class_4719;)Lnet/minecraft/class_5601; + METHOD method_32078 createSign (Lnet/minecraft/class_4719;)Lnet/minecraft/class_5601; ARG 0 type METHOD method_32079 registerMain (Ljava/lang/String;)Lnet/minecraft/class_5601; ARG 0 id diff --git a/mappings/net/minecraft/util/StringIdentifiable.mapping b/mappings/net/minecraft/util/StringIdentifiable.mapping index d45bd21cec..796c1abca7 100644 --- a/mappings/net/minecraft/util/StringIdentifiable.mapping +++ b/mappings/net/minecraft/util/StringIdentifiable.mapping @@ -13,8 +13,14 @@ CLASS net/minecraft/class_3542 net/minecraft/util/StringIdentifiable ARG 0 compressedEncoder ARG 1 compressedDecoder ARG 2 decoder + METHOD method_28142 toKeyable ([Lnet/minecraft/class_3542;)Lcom/mojang/serialization/Keyable; + ARG 0 values METHOD method_28143 ([Ljava/lang/Enum;I)Ljava/lang/Enum; ARG 1 ordinal CLASS 1 METHOD encode (Ljava/lang/Object;Lcom/mojang/serialization/DynamicOps;Ljava/lang/Object;)Lcom/mojang/serialization/DataResult; ARG 1 value + METHOD method_28148 (Ljava/util/function/Function;Ljava/lang/String;)Lcom/mojang/serialization/DataResult; + ARG 1 name + METHOD method_28149 (Ljava/util/function/IntFunction;Ljava/lang/Number;)Lcom/mojang/serialization/DataResult; + ARG 1 id diff --git a/mappings/net/minecraft/util/collection/WeightedList.mapping b/mappings/net/minecraft/util/collection/WeightedList.mapping index 996237c36d..aff6be3834 100644 --- a/mappings/net/minecraft/util/collection/WeightedList.mapping +++ b/mappings/net/minecraft/util/collection/WeightedList.mapping @@ -22,11 +22,11 @@ CLASS net/minecraft/class_4131 net/minecraft/util/collection/WeightedList ARG 0 codec METHOD method_28339 isEmpty ()Z CLASS class_4132 Entry - FIELD field_18400 item Ljava/lang/Object; + FIELD field_18400 data Ljava/lang/Object; FIELD field_18401 weight I FIELD field_18402 shuffledOrder D METHOD (Ljava/lang/Object;I)V - ARG 1 item + ARG 1 data ARG 2 weight METHOD method_19033 getShuffledOrder ()D METHOD method_19034 setShuffledOrder (F)V diff --git a/mappings/net/minecraft/util/math/Matrix4f.mapping b/mappings/net/minecraft/util/math/Matrix4f.mapping index d210f7fd96..c0f06ea525 100644 --- a/mappings/net/minecraft/util/math/Matrix4f.mapping +++ b/mappings/net/minecraft/util/math/Matrix4f.mapping @@ -46,7 +46,7 @@ CLASS net/minecraft/class_1159 net/minecraft/util/math/Matrix4f ARG 1 y ARG 2 z METHOD method_31544 multiplyByTranslation (FFF)V - COMMENT Multiplies the matrix by the translation matrix consists of {@code x}, {@code y} and {@code z}. + COMMENT Multiplies the matrix by the translation matrix consisting of {@code x}, {@code y} and {@code z}. COMMENT COMMENT

{@code multiplyByTranslation(x, y, z)} is equivalent to {@code multiply(Matrix4f.translate(x, y, z))}. ARG 1 x diff --git a/mappings/net/minecraft/world/World.mapping b/mappings/net/minecraft/world/World.mapping index e6d9c47536..12a5208017 100644 --- a/mappings/net/minecraft/world/World.mapping +++ b/mappings/net/minecraft/world/World.mapping @@ -77,10 +77,10 @@ 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_31594 addBlockEntityTicker (Lnet/minecraft/class_5562;)V METHOD method_31595 addBlockBreakParticles (Lnet/minecraft/class_2338;Lnet/minecraft/class_2680;)V ARG 1 pos ARG 2 state - METHOD method_31594 addBlockEntityTicker (Lnet/minecraft/class_5562;)V METHOD method_8413 updateListeners (Lnet/minecraft/class_2338;Lnet/minecraft/class_2680;Lnet/minecraft/class_2680;I)V ARG 1 pos ARG 2 oldState @@ -126,6 +126,13 @@ CLASS net/minecraft/class_1937 net/minecraft/world/World METHOD method_8454 createExplosion (Lnet/minecraft/class_1297;Lnet/minecraft/class_1282;Lnet/minecraft/class_5362;DDDFZLnet/minecraft/class_1927$class_4179;)Lnet/minecraft/class_1927; ARG 1 entity ARG 2 damageSource + ARG 3 behavior + ARG 4 x + ARG 6 y + ARG 8 z + ARG 10 power + ARG 11 createFire + ARG 12 destructionType METHOD method_8455 updateComparators (Lnet/minecraft/class_2338;Lnet/minecraft/class_2248;)V ARG 1 pos ARG 2 block diff --git a/mappings/net/minecraft/world/biome/SpawnSettings.mapping b/mappings/net/minecraft/world/biome/SpawnSettings.mapping index 53820115c7..73005985eb 100644 --- a/mappings/net/minecraft/world/biome/SpawnSettings.mapping +++ b/mappings/net/minecraft/world/biome/SpawnSettings.mapping @@ -14,7 +14,7 @@ CLASS net/minecraft/class_5483 net/minecraft/world/biome/SpawnSettings METHOD method_31002 getCreatureSpawnProbability ()F METHOD method_31003 getSpawnDensity (Lnet/minecraft/class_1299;)Lnet/minecraft/class_5483$class_5265; ARG 1 entityType - METHOD method_31004 getSpawnEntry (Lnet/minecraft/class_1311;)Ljava/util/List; + METHOD method_31004 getSpawnEntries (Lnet/minecraft/class_1311;)Ljava/util/List; ARG 1 spawnGroup METHOD method_31082 isPlayerSpawnFriendly ()Z CLASS class_1964 SpawnEntry diff --git a/mappings/net/minecraft/world/explosion/Explosion.mapping b/mappings/net/minecraft/world/explosion/Explosion.mapping index 7994ec2c69..7374e7452c 100644 --- a/mappings/net/minecraft/world/explosion/Explosion.mapping +++ b/mappings/net/minecraft/world/explosion/Explosion.mapping @@ -20,6 +20,15 @@ CLASS net/minecraft/class_1927 net/minecraft/world/explosion/Explosion ARG 7 z ARG 9 power ARG 10 affectedBlocks + METHOD (Lnet/minecraft/class_1937;Lnet/minecraft/class_1297;DDDFZLnet/minecraft/class_1927$class_4179;)V + ARG 1 world + ARG 2 entity + ARG 3 x + ARG 5 y + ARG 7 z + ARG 9 power + ARG 10 createFire + ARG 11 destructionType METHOD (Lnet/minecraft/class_1937;Lnet/minecraft/class_1297;DDDFZLnet/minecraft/class_1927$class_4179;Ljava/util/List;)V ARG 1 world ARG 2 entity @@ -33,6 +42,14 @@ CLASS net/minecraft/class_1927 net/minecraft/world/explosion/Explosion METHOD (Lnet/minecraft/class_1937;Lnet/minecraft/class_1297;Lnet/minecraft/class_1282;Lnet/minecraft/class_5362;DDDFZLnet/minecraft/class_1927$class_4179;)V ARG 1 world ARG 2 entity + ARG 3 damageSource + ARG 4 behavior + ARG 5 x + ARG 7 y + ARG 9 z + ARG 11 power + ARG 12 createFire + ARG 13 destructionType METHOD method_17752 getExposure (Lnet/minecraft/class_243;Lnet/minecraft/class_1297;)F ARG 0 source ARG 1 entity