From 4bcc8ac47cbf1651708665469728288740d4143c Mon Sep 17 00:00:00 2001 From: liach <7806504+liach@users.noreply.github.com> Date: Tue, 24 Mar 2020 17:54:23 -0500 Subject: [PATCH] EntityContext -> ShapeContext, EntityContextImpl -> EntityShapeContext (#1213) Fixes #908. This context is exclusively used by block's 3 shape checking methods. For its usage outside of blocks, it is used to be eventually passed to call one of the shape checking methods (as in CollisionView#canPlace or RayTraceContext) Signed-off-by: liach Co-authored-by: liach --- .../EntityShapeContext.mapping} | 2 +- .../EntityContext.mapping => block/ShapeContext.mapping} | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) rename mappings/net/minecraft/{entity/EntityContextImpl.mapping => block/EntityShapeContext.mapping} (82%) rename mappings/net/minecraft/{entity/EntityContext.mapping => block/ShapeContext.mapping} (85%) diff --git a/mappings/net/minecraft/entity/EntityContextImpl.mapping b/mappings/net/minecraft/block/EntityShapeContext.mapping similarity index 82% rename from mappings/net/minecraft/entity/EntityContextImpl.mapping rename to mappings/net/minecraft/block/EntityShapeContext.mapping index 0b8119509a..66a63ac19d 100644 --- a/mappings/net/minecraft/entity/EntityContextImpl.mapping +++ b/mappings/net/minecraft/block/EntityShapeContext.mapping @@ -1,4 +1,4 @@ -CLASS net/minecraft/class_3727 net/minecraft/entity/EntityContextImpl +CLASS net/minecraft/class_3727 net/minecraft/block/EntityShapeContext FIELD field_16450 minY D FIELD field_16451 descending Z FIELD field_17593 ABSENT Lnet/minecraft/class_3726; diff --git a/mappings/net/minecraft/entity/EntityContext.mapping b/mappings/net/minecraft/block/ShapeContext.mapping similarity index 85% rename from mappings/net/minecraft/entity/EntityContext.mapping rename to mappings/net/minecraft/block/ShapeContext.mapping index 294afe2ff0..0ef471dd6a 100644 --- a/mappings/net/minecraft/entity/EntityContext.mapping +++ b/mappings/net/minecraft/block/ShapeContext.mapping @@ -1,4 +1,4 @@ -CLASS net/minecraft/class_3726 net/minecraft/entity/EntityContext +CLASS net/minecraft/class_3726 net/minecraft/block/ShapeContext METHOD method_16192 isAbove (Lnet/minecraft/class_265;Lnet/minecraft/class_2338;Z)Z ARG 1 shape ARG 2 pos