From 89c34262d0a8bcbc3165e58499cc4fb2df5bccc1 Mon Sep 17 00:00:00 2001 From: Jozufozu Date: Thu, 22 Jul 2021 14:06:48 -0700 Subject: [PATCH] Flaps no longer use old origin pos behavior --- .../simibubi/create/content/logistics/block/FlapData.java | 8 -------- .../logistics/block/belts/tunnel/BeltTunnelInstance.java | 2 +- .../content/logistics/block/funnel/FunnelInstance.java | 2 +- 3 files changed, 2 insertions(+), 10 deletions(-) diff --git a/src/main/java/com/simibubi/create/content/logistics/block/FlapData.java b/src/main/java/com/simibubi/create/content/logistics/block/FlapData.java index 660b61b42..5dfe87e95 100644 --- a/src/main/java/com/simibubi/create/content/logistics/block/FlapData.java +++ b/src/main/java/com/simibubi/create/content/logistics/block/FlapData.java @@ -43,14 +43,6 @@ public class FlapData extends InstanceData implements IFlatLight { return setPosition(pos.x(), pos.y(), pos.z()); } - public FlapData setPosition(int x, int y, int z) { - Vector3i origin = owner.originCoordinate.get(); - - return setPosition((float) (x - origin.getX()), - (float) (y - origin.getY()), - (float) (z - origin.getZ())); - } - public FlapData setPosition(float x, float y, float z) { this.x = x; this.y = y; diff --git a/src/main/java/com/simibubi/create/content/logistics/block/belts/tunnel/BeltTunnelInstance.java b/src/main/java/com/simibubi/create/content/logistics/block/belts/tunnel/BeltTunnelInstance.java index beeb853fd..2d0e363d2 100644 --- a/src/main/java/com/simibubi/create/content/logistics/block/belts/tunnel/BeltTunnelInstance.java +++ b/src/main/java/com/simibubi/create/content/logistics/block/belts/tunnel/BeltTunnelInstance.java @@ -50,7 +50,7 @@ public class BeltTunnelInstance extends TileEntityInstance FlapData key = model.createInstance(); - key.setPosition(pos) + key.setPosition(getInstancePosition()) .setSegmentOffset(segmentOffset, 0, 0) .setBlockLight(blockLight) .setSkyLight(skyLight) diff --git a/src/main/java/com/simibubi/create/content/logistics/block/funnel/FunnelInstance.java b/src/main/java/com/simibubi/create/content/logistics/block/funnel/FunnelInstance.java index 170d8e578..fb8fc8545 100644 --- a/src/main/java/com/simibubi/create/content/logistics/block/funnel/FunnelInstance.java +++ b/src/main/java/com/simibubi/create/content/logistics/block/funnel/FunnelInstance.java @@ -46,7 +46,7 @@ public class FunnelInstance extends TileEntityInstance impleme FlapData key = model.createInstance(); - key.setPosition(pos) + key.setPosition(getInstancePosition()) .setSegmentOffset(segmentOffset, 0, -tile.getFlapOffset()) .setBlockLight(blockLight) .setSkyLight(skyLight)