Make all directrix types disallow wave entry via their output faces

Robotgiggle · Robotgiggle · commit 87f2df4fba7a · 2025-08-04T23:33:11.000-04:00
diff --git a/Common/src/main/java/at/petrak/hexcasting/common/blocks/circles/directrix/BlockBooleanDirectrix.java b/Common/src/main/java/at/petrak/hexcasting/common/blocks/circles/directrix/BlockBooleanDirectrix.java
@@ -70,7 +70,7 @@ public ControlFlow acceptControlFlow(CastingImage imageIn, CircleCastEnv env, Di
 
     @Override
     public boolean canEnterFromDirection(Direction enterDir, BlockPos pos, BlockState bs, ServerLevel world) {
-        // No entering from the front, no entering from the back.
+        // No entering from either of the output faces
         return enterDir != bs.getValue(FACING).getOpposite() && enterDir != bs.getValue(FACING);
     }
 
diff --git a/Common/src/main/java/at/petrak/hexcasting/common/blocks/circles/directrix/BlockEmptyDirectrix.java b/Common/src/main/java/at/petrak/hexcasting/common/blocks/circles/directrix/BlockEmptyDirectrix.java
@@ -43,7 +43,8 @@ public ControlFlow acceptControlFlow(CastingImage imageIn, CircleCastEnv env, Di
 
     @Override
     public boolean canEnterFromDirection(Direction enterDir, BlockPos pos, BlockState bs, ServerLevel world) {
-        return true;
+        // No entering from either of the output faces
+        return enterDir != bs.getValue(FACING).getOpposite() && enterDir != bs.getValue(FACING);
     }
 
     @Override
diff --git a/Common/src/main/java/at/petrak/hexcasting/common/blocks/circles/directrix/BlockRedstoneDirectrix.java b/Common/src/main/java/at/petrak/hexcasting/common/blocks/circles/directrix/BlockRedstoneDirectrix.java
@@ -46,7 +46,8 @@ public ControlFlow acceptControlFlow(CastingImage imageIn, CircleCastEnv env, Di
 
     @Override
     public boolean canEnterFromDirection(Direction enterDir, BlockPos pos, BlockState bs, ServerLevel world) {
-        return true;
+        // No entering from either of the output faces
+        return enterDir != bs.getValue(FACING).getOpposite() && enterDir != bs.getValue(FACING);
     }
 
     @Override

Original file line number	Diff line number	Diff line change
`@@ -70,7 +70,7 @@ public ControlFlow acceptControlFlow(CastingImage imageIn, CircleCastEnv env, Di`
`70`	`70`
`71`	`71`	`@Override`
`72`	`72`	`public boolean canEnterFromDirection(Direction enterDir, BlockPos pos, BlockState bs, ServerLevel world) {`
`73`		`- // No entering from the front, no entering from the back.`
	`73`	`+ // No entering from either of the output faces`
`74`	`74`	`return enterDir != bs.getValue(FACING).getOpposite() && enterDir != bs.getValue(FACING);`
`75`	`75`	`}`
`76`	`76`
Original file line number	Diff line number	Diff line change
`@@ -43,7 +43,8 @@ public ControlFlow acceptControlFlow(CastingImage imageIn, CircleCastEnv env, Di`
`43`	`43`
`44`	`44`	`@Override`
`45`	`45`	`public boolean canEnterFromDirection(Direction enterDir, BlockPos pos, BlockState bs, ServerLevel world) {`
`46`		`- return true;`
	`46`	`+ // No entering from either of the output faces`
	`47`	`+ return enterDir != bs.getValue(FACING).getOpposite() && enterDir != bs.getValue(FACING);`
`47`	`48`	`}`
`48`	`49`
`49`	`50`	`@Override`
Original file line number	Diff line number	Diff line change
`@@ -46,7 +46,8 @@ public ControlFlow acceptControlFlow(CastingImage imageIn, CircleCastEnv env, Di`
`46`	`46`
`47`	`47`	`@Override`
`48`	`48`	`public boolean canEnterFromDirection(Direction enterDir, BlockPos pos, BlockState bs, ServerLevel world) {`
`49`		`- return true;`
	`49`	`+ // No entering from either of the output faces`
	`50`	`+ return enterDir != bs.getValue(FACING).getOpposite() && enterDir != bs.getValue(FACING);`
`50`	`51`	`}`
`51`	`52`
`52`	`53`	`@Override`