Merge pull request #16 from TheRealWormbo/piston-structure-value-reuse

Reuse values from parent PistonStructureResolver
VazkiiMods · Apr 3, 2024 · 970f4b8 · 970f4b8
2 parents ec4e1f1 + a1ec7c4
commit 970f4b8
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 8 deletions.
diff --git a/src/main/java/org/violetmoon/zeta/mixin/mixins/AccessorPistonStructureResolver.java b/src/main/java/org/violetmoon/zeta/mixin/mixins/AccessorPistonStructureResolver.java
@@ -22,4 +22,7 @@ public interface AccessorPistonStructureResolver {
 
 	@Accessor("pistonDirection")
 	Direction zeta$pistonDirection();
+
+	@Accessor("startPos")
+	BlockPos zeta$startPos();
 }
diff --git a/src/main/java/org/violetmoon/zeta/piston/ZetaPistonStructureResolver.java b/src/main/java/org/violetmoon/zeta/piston/ZetaPistonStructureResolver.java
@@ -94,14 +94,8 @@ public ZetaPistonStructureResolver(PistonStructureResolver parent) {
 
 		this.world = ((AccessorPistonStructureResolver) parent).zeta$level();
 		this.pistonPos = ((AccessorPistonStructureResolver) parent).zeta$pistonPos();
-		Direction pistonFacing = ((AccessorPistonStructureResolver) parent).zeta$pistonDirection();
-		if(((AccessorPistonStructureResolver) parent).zeta$extending()) {
-			this.moveDirection = pistonFacing;
-			this.blockToMove = this.pistonPos.relative(pistonFacing);
-		} else {
-			this.moveDirection = pistonFacing.getOpposite();
-			this.blockToMove = this.pistonPos.relative(pistonFacing, 2);
-		}
+		this.moveDirection = parent.getPushDirection();
+		this.blockToMove = ((AccessorPistonStructureResolver) parent).zeta$startPos();
 	}
 
 	@Override