From 11d3a5cf6e63dbad640ed1092c7f45a5f0a30f83 Mon Sep 17 00:00:00 2001 From: biom4st3r <37042156+biom4st3r@users.noreply.github.com> Date: Wed, 30 Oct 2019 18:50:18 +0300 Subject: [PATCH] StatusEffect mapping and Cuboid Method rename (#906) * Mappings for statusEffects Changed Cuboid.copyRotation -> Cuboid.copyRotationAndPoint because of the misleading name * Apply suggestions from code review Co-Authored-By: Runemoro Co-Authored-By: liach <7806504+liach@users.noreply.github.com> * Update mappings/net/minecraft/entity/effect/StatusEffect.mapping Co-Authored-By: liach <7806504+liach@users.noreply.github.com> --- mappings/net/minecraft/client/model/ModelPart.mapping | 2 +- mappings/net/minecraft/entity/effect/StatusEffect.mapping | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/mappings/net/minecraft/client/model/ModelPart.mapping b/mappings/net/minecraft/client/model/ModelPart.mapping index 1420dea2d4..3daa36086d 100644 --- a/mappings/net/minecraft/client/model/ModelPart.mapping +++ b/mappings/net/minecraft/client/model/ModelPart.mapping @@ -77,7 +77,7 @@ CLASS net/minecraft/class_630 net/minecraft/client/model/ModelPart ARG 1 model ARG 2 textureOffsetU ARG 3 textureOffsetV - METHOD method_17138 copyRotation (Lnet/minecraft/class_630;)V + METHOD method_17138 copyPositionAndRotation (Lnet/minecraft/class_630;)V METHOD method_22698 render (Lnet/minecraft/class_4587;Lnet/minecraft/class_4588;FIILnet/minecraft/class_1058;)V ARG 1 matrix ARG 2 vertexConsumer diff --git a/mappings/net/minecraft/entity/effect/StatusEffect.mapping b/mappings/net/minecraft/entity/effect/StatusEffect.mapping index be96a383e9..a43f1df074 100644 --- a/mappings/net/minecraft/entity/effect/StatusEffect.mapping +++ b/mappings/net/minecraft/entity/effect/StatusEffect.mapping @@ -10,6 +10,8 @@ CLASS net/minecraft/class_1291 net/minecraft/entity/effect/StatusEffect ARG 0 type METHOD method_5555 onApplied (Lnet/minecraft/class_1309;Lnet/minecraft/class_1325;I)V METHOD method_5556 getColor ()I + METHOD method_5559 loadTranslationKey ()Ljava/lang/String; + METHOD method_5560 getName ()Lnet/minecraft/class_2561; METHOD method_5561 isInstant ()Z METHOD method_5562 onRemoved (Lnet/minecraft/class_1309;Lnet/minecraft/class_1325;I)V METHOD method_5564 applyInstantEffect (Lnet/minecraft/class_1297;Lnet/minecraft/class_1297;Lnet/minecraft/class_1309;ID)V