From 168d6b23ec91393554fcb3d51c64e493d88d940e Mon Sep 17 00:00:00 2001 From: Yanis48 Date: Sun, 8 Mar 2020 23:14:25 +0100 Subject: [PATCH] Random fixes (#1162) --- ...LeashEntityModel.mapping => LeashKnotEntityModel.mapping} | 2 +- mappings/net/minecraft/entity/ProjectileUtil.mapping | 3 +++ .../{LeadKnotEntity.mapping => LeashKnotEntity.mapping} | 5 ++++- .../net/minecraft/entity/mob/AbstractSkeletonEntity.mapping | 1 + .../net/minecraft/entity/projectile/ProjectileEntity.mapping | 1 + .../server/network/ServerLoginNetworkHandler.mapping | 3 ++- mappings/net/minecraft/world/World.mapping | 2 +- 7 files changed, 13 insertions(+), 4 deletions(-) rename mappings/net/minecraft/client/render/entity/model/{LeashEntityModel.mapping => LeashKnotEntityModel.mapping} (69%) rename mappings/net/minecraft/entity/decoration/{LeadKnotEntity.mapping => LeashKnotEntity.mapping} (64%) diff --git a/mappings/net/minecraft/client/render/entity/model/LeashEntityModel.mapping b/mappings/net/minecraft/client/render/entity/model/LeashKnotEntityModel.mapping similarity index 69% rename from mappings/net/minecraft/client/render/entity/model/LeashEntityModel.mapping rename to mappings/net/minecraft/client/render/entity/model/LeashKnotEntityModel.mapping index 79d5c76fc6..b15359fd40 100644 --- a/mappings/net/minecraft/client/render/entity/model/LeashEntityModel.mapping +++ b/mappings/net/minecraft/client/render/entity/model/LeashKnotEntityModel.mapping @@ -1 +1 @@ -CLASS net/minecraft/class_579 net/minecraft/client/render/entity/model/LeashEntityModel +CLASS net/minecraft/class_579 net/minecraft/client/render/entity/model/LeashKnotEntityModel diff --git a/mappings/net/minecraft/entity/ProjectileUtil.mapping b/mappings/net/minecraft/entity/ProjectileUtil.mapping index 38963ff356..76143802d5 100644 --- a/mappings/net/minecraft/entity/ProjectileUtil.mapping +++ b/mappings/net/minecraft/entity/ProjectileUtil.mapping @@ -14,6 +14,9 @@ CLASS net/minecraft/class_1675 net/minecraft/entity/ProjectileUtil ARG 0 entity ARG 1 item METHOD method_18813 createArrowProjectile (Lnet/minecraft/class_1309;Lnet/minecraft/class_1799;F)Lnet/minecraft/class_1665; + ARG 0 entity + ARG 1 stack + ARG 2 damageModifier METHOD method_7482 getCollision (Lnet/minecraft/class_1297;ZZLnet/minecraft/class_1297;Lnet/minecraft/class_3959$class_3960;ZLjava/util/function/Predicate;Lnet/minecraft/class_238;)Lnet/minecraft/class_239; ARG 0 entity ARG 4 shapeType diff --git a/mappings/net/minecraft/entity/decoration/LeadKnotEntity.mapping b/mappings/net/minecraft/entity/decoration/LeashKnotEntity.mapping similarity index 64% rename from mappings/net/minecraft/entity/decoration/LeadKnotEntity.mapping rename to mappings/net/minecraft/entity/decoration/LeashKnotEntity.mapping index 30f2eb521e..bf78bf8dd6 100644 --- a/mappings/net/minecraft/entity/decoration/LeadKnotEntity.mapping +++ b/mappings/net/minecraft/entity/decoration/LeashKnotEntity.mapping @@ -1,4 +1,7 @@ -CLASS net/minecraft/class_1532 net/minecraft/entity/decoration/LeadKnotEntity +CLASS net/minecraft/class_1532 net/minecraft/entity/decoration/LeashKnotEntity + METHOD (Lnet/minecraft/class_1937;Lnet/minecraft/class_2338;)V + ARG 1 world + ARG 2 pos METHOD method_6932 getOrCreate (Lnet/minecraft/class_1937;Lnet/minecraft/class_2338;)Lnet/minecraft/class_1532; ARG 0 world ARG 1 pos diff --git a/mappings/net/minecraft/entity/mob/AbstractSkeletonEntity.mapping b/mappings/net/minecraft/entity/mob/AbstractSkeletonEntity.mapping index 188024d591..ba5f007551 100644 --- a/mappings/net/minecraft/entity/mob/AbstractSkeletonEntity.mapping +++ b/mappings/net/minecraft/entity/mob/AbstractSkeletonEntity.mapping @@ -3,5 +3,6 @@ CLASS net/minecraft/class_1547 net/minecraft/entity/mob/AbstractSkeletonEntity FIELD field_7221 meleeAttackGoal Lnet/minecraft/class_1366; METHOD method_6996 createArrowProjectile (Lnet/minecraft/class_1799;F)Lnet/minecraft/class_1665; ARG 1 arrow + ARG 2 damageModifier METHOD method_6997 updateAttackType ()V METHOD method_6998 getStepSound ()Lnet/minecraft/class_3414; diff --git a/mappings/net/minecraft/entity/projectile/ProjectileEntity.mapping b/mappings/net/minecraft/entity/projectile/ProjectileEntity.mapping index 2198f9166a..eaf72734f8 100644 --- a/mappings/net/minecraft/entity/projectile/ProjectileEntity.mapping +++ b/mappings/net/minecraft/entity/projectile/ProjectileEntity.mapping @@ -31,6 +31,7 @@ CLASS net/minecraft/class_1665 net/minecraft/entity/projectile/ProjectileEntity ARG 1 currentPosition ARG 2 nextPosition METHOD method_7435 applyEnchantmentEffects (Lnet/minecraft/class_1309;F)V + ARG 1 entity ARG 2 damageModifier METHOD method_7436 getDragInWater ()F METHOD method_7438 setDamage (D)V diff --git a/mappings/net/minecraft/server/network/ServerLoginNetworkHandler.mapping b/mappings/net/minecraft/server/network/ServerLoginNetworkHandler.mapping index 57cc31177d..9e1195b303 100644 --- a/mappings/net/minecraft/server/network/ServerLoginNetworkHandler.mapping +++ b/mappings/net/minecraft/server/network/ServerLoginNetworkHandler.mapping @@ -4,10 +4,11 @@ CLASS net/minecraft/class_3248 net/minecraft/server/network/ServerLoginNetworkHa FIELD field_14158 connection Lnet/minecraft/class_2535; FIELD field_14159 secretKey Ljavax/crypto/SecretKey; FIELD field_14160 profile Lcom/mojang/authlib/GameProfile; - FIELD field_14161 clientEntity Lnet/minecraft/class_3222; + FIELD field_14161 player Lnet/minecraft/class_3222; FIELD field_14162 server Lnet/minecraft/server/MinecraftServer; FIELD field_14163 state Lnet/minecraft/class_3248$class_3249; FIELD field_14164 RANDOM Ljava/util/Random; + FIELD field_14165 serverId Ljava/lang/String; FIELD field_14166 LOGGER Lorg/apache/logging/log4j/Logger; FIELD field_14167 nonce [B METHOD (Lnet/minecraft/server/MinecraftServer;Lnet/minecraft/class_2535;)V diff --git a/mappings/net/minecraft/world/World.mapping b/mappings/net/minecraft/world/World.mapping index 982734d726..4978a73d25 100644 --- a/mappings/net/minecraft/world/World.mapping +++ b/mappings/net/minecraft/world/World.mapping @@ -106,7 +106,7 @@ CLASS net/minecraft/class_1937 net/minecraft/world/World ARG 7 z ARG 9 power ARG 10 createFire - METHOD method_8455 updateHorizontalAdjacent (Lnet/minecraft/class_2338;Lnet/minecraft/class_2248;)V + METHOD method_8455 updateComparators (Lnet/minecraft/class_2338;Lnet/minecraft/class_2248;)V ARG 1 pos METHOD method_8457 getDebugString ()Ljava/lang/String; METHOD method_8458 isSavingDisabled ()Z