Duct-tape piston resolver, closes #64, #63, #61

Author: quat1024

changelog.txt

@@ -1,10 +1 @@
-- Implement `@ModuleInstance` (MehVahdJukaar)
-- Complain when mods return null from `IForgeItem#getCraftingRemainingItem` and try to move on instead of crashing b/c I'm sick of fielding issue reports about it lol (quat)
-- Pressing Escape backs up only 1 level from config screens instead of kicking you out (quat)
-- Try and fix the Quark config being perpetually "incorrect"; had to do with anti-overlap comments (quat)
-- Change how config loading works; ensure everything is loaded on the correct threads at the correct times, ignore config change requests that happen too early, lots of verbose logging. (quat)
-
-Changes from older versions (which were mistakenly uploaded as 1.20.0 so you might not have seen them)
-
-- fixed an issue with piston and sticky blocks (MehVahdJukaar)
-- Some fixes for the config loading race condition (MehVahdJukaar)
+- Try and fix crashes related to ZetaPistonStructureResolver

src/main/java/org/violetmoon/zeta/piston/ZetaPistonStructureResolver.java

@@ -115,10 +115,23 @@ public boolean resolve() {
         } else if (!addBlockLine(blockToMove, moveDirection))
             return false;
         else {
-            for (BlockPos blockpos : myToPush) {
-                if (addBranchingBlocks(world, blockpos, isBlockBranching(world, blockpos)) == MoveResult.PREVENT)
-                    return false;
-            }
+            //vanilla does this
+            //for(int i = 0; i < this.toPush.size(); ++i) {
+            //  BlockPos blockpos = (BlockPos)this.toPush.get(i);
+            //  if (this.level.getBlockState(blockpos).isStickyBlock() && !this.addBranchingBlocks(blockpos)) {
+            //    return false;
+            //  }
+            //}
+            //we need to replace the stickiness logic with more complicated branching logic
+            //i.e. a normal block needs to trigger addBranchingBlocks code if there is a Quark chain next to it.
+            //an indexed for is fine in vanilla since it never removes blocks from toPush (we do)
+
+	          //noinspection ForLoopReplaceableByForEach //it isn't, we modify myToPush
+	          for(int i = 0; i < myToPush.size(); i++) {
+		            BlockPos blockpos = myToPush.get(i);
+		                if(addBranchingBlocks(world, blockpos, isBlockBranching(world, blockpos)) == MoveResult.PREVENT)
+			                  return false;
+	          }
 
             return true;
         }
@@ -222,7 +235,7 @@ else if (res != MoveResult.MOVE) {
 
                     if (state.getPistonPushReaction() == PushReaction.DESTROY) {
                         myToDestroy.add(currentPos);
-                        myToPush.remove(currentPos);
+//                        myToPush.remove(currentPos);
                         return true;
                     }
 
@@ -294,7 +307,6 @@ private MoveResult addBranchingBlocks(Level world, BlockPos fromPos, boolean isS
                 case BREAK:
                     if (PistonBaseBlock.isPushable(targetState, world, targetPos, moveDirection, true, moveDirection)) {
                         myToDestroy.add(targetPos);
-                        myToPush.remove(targetPos);
                         return MoveResult.BREAK;
                     }