From 0b53aeb032fb7fdfcf6b02d75f75cdfe84e20d89 Mon Sep 17 00:00:00 2001 From: Glease <4586901+Glease@users.noreply.github.com> Date: Wed, 10 Aug 2022 13:07:08 +0800 Subject: do not return IAlignment if MTE is not IAlignmentProvider (#1234) --- .../api/metatileentity/BaseMetaTileEntity.java | 21 ++------------------- 1 file changed, 2 insertions(+), 19 deletions(-) (limited to 'src/main/java/gregtech/api') diff --git a/src/main/java/gregtech/api/metatileentity/BaseMetaTileEntity.java b/src/main/java/gregtech/api/metatileentity/BaseMetaTileEntity.java index 0af728ef27..b68715770c 100644 --- a/src/main/java/gregtech/api/metatileentity/BaseMetaTileEntity.java +++ b/src/main/java/gregtech/api/metatileentity/BaseMetaTileEntity.java @@ -2079,7 +2079,8 @@ public class BaseMetaTileEntity extends CommonMetaTileEntity implements IGregTec @Override public IAlignment getAlignment() { - return getMetaTileEntity() instanceof IAlignmentProvider ? ((IAlignmentProvider) getMetaTileEntity()).getAlignment() : new BasicAlignment(); + return getMetaTileEntity() instanceof IAlignmentProvider ? ((IAlignmentProvider) getMetaTileEntity()).getAlignment() : + getMetaTileEntity() instanceof IAlignment ? (IAlignment) getMetaTileEntity() : null; } @Nullable @@ -2087,22 +2088,4 @@ public class BaseMetaTileEntity extends CommonMetaTileEntity implements IGregTec public IConstructable getConstructable() { return getMetaTileEntity() instanceof IConstructable ? (IConstructable) getMetaTileEntity() : null; } - - private class BasicAlignment implements IAlignment { - - @Override - public ExtendedFacing getExtendedFacing() { - return ExtendedFacing.of(ForgeDirection.getOrientation(getFrontFacing())); - } - - @Override - public void setExtendedFacing(ExtendedFacing alignment) { - setFrontFacing((byte) Math.min(alignment.getDirection().ordinal(), ForgeDirection.UNKNOWN.ordinal() - 1)); - } - - @Override - public IAlignmentLimits getAlignmentLimits() { - return (direction, rotation, flip) -> rotation.isNotRotated() && flip.isNotFlipped(); - } - } } -- cgit