aboutsummaryrefslogtreecommitdiff
path: root/src/main/java/gregtech/api
diff options
context:
space:
mode:
authorGlease <4586901+Glease@users.noreply.github.com>2022-08-10 13:07:08 +0800
committerGitHub <noreply@github.com>2022-08-10 07:07:08 +0200
commit0b53aeb032fb7fdfcf6b02d75f75cdfe84e20d89 (patch)
tree6730ed376e5a2c17bbf9a27e73741fc531294b93 /src/main/java/gregtech/api
parent39a672b7c4b7b9033d4577c6dae1d4ea0a414ee3 (diff)
downloadGT5-Unofficial-0b53aeb032fb7fdfcf6b02d75f75cdfe84e20d89.tar.gz
GT5-Unofficial-0b53aeb032fb7fdfcf6b02d75f75cdfe84e20d89.tar.bz2
GT5-Unofficial-0b53aeb032fb7fdfcf6b02d75f75cdfe84e20d89.zip
do not return IAlignment if MTE is not IAlignmentProvider (#1234)
Diffstat (limited to 'src/main/java/gregtech/api')
-rw-r--r--src/main/java/gregtech/api/metatileentity/BaseMetaTileEntity.java21
1 files changed, 2 insertions, 19 deletions
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();
- }
- }
}