Reverse circles and a more "dynamic" ship builder

Author: JSJBDEV

src/main/java/ace/actually/pirates/blocks/MotionInvokingBlock.java

@@ -72,11 +72,15 @@ private static void stopMotion(World world, BlockPos pos)
         DimensionIdProvider provider = (DimensionIdProvider) world;
         ChunkPos chunkPos = world.getChunk(pos).getPos();
         LoadedServerShip ship = (LoadedServerShip) ValkyrienSkiesMod.getVsCore().getHooks().getCurrentShipServerWorld().getLoadedShips().getByChunkPos(chunkPos.x, chunkPos.z, provider.getDimensionId());
-        SeatedControllingPlayer seatedControllingPlayer = ship.getAttachment(SeatedControllingPlayer.class);
-        seatedControllingPlayer.setLeftImpulse(0);
-        seatedControllingPlayer.setForwardImpulse(0);
-        seatedControllingPlayer.setCruise(false);
-        seatedControllingPlayer.setUpImpulse(0);
-        ship.setAttachment(SeatedControllingPlayer.class, seatedControllingPlayer);
+        if(ship!=null)
+        {
+            SeatedControllingPlayer seatedControllingPlayer = ship.getAttachment(SeatedControllingPlayer.class);
+            seatedControllingPlayer.setLeftImpulse(0);
+            seatedControllingPlayer.setForwardImpulse(0);
+            seatedControllingPlayer.setCruise(false);
+            seatedControllingPlayer.setUpImpulse(0);
+            ship.setAttachment(SeatedControllingPlayer.class, seatedControllingPlayer);
+        }
+
     }
 }

src/main/java/ace/actually/pirates/blocks/entity/MotionInvokingBlockEntity.java

@@ -2,24 +2,27 @@
 
 import ace.actually.pirates.util.PatternProcessor;
 import ace.actually.pirates.Pirates;
+import net.minecraft.block.Block;
 import net.minecraft.block.BlockState;
 import net.minecraft.block.Blocks;
 import net.minecraft.block.entity.BlockEntity;
 import net.minecraft.nbt.NbtCompound;
 import net.minecraft.nbt.NbtList;
-import net.minecraft.registry.tag.BlockTags;
 import net.minecraft.server.world.ServerWorld;
 import net.minecraft.util.math.BlockPos;
 import net.minecraft.util.math.ChunkPos;
 import net.minecraft.world.World;
 import org.valkyrienskies.core.api.ships.LoadedServerShip;
+import org.valkyrienskies.core.util.datastructures.DenseBlockPosSet;
 import org.valkyrienskies.eureka.block.ShipHelmBlock;
-import org.valkyrienskies.eureka.util.ShipAssembler;
 import org.valkyrienskies.mod.api.SeatedControllingPlayer;
 import org.valkyrienskies.mod.common.VSGameUtilsKt;
 import org.valkyrienskies.mod.common.ValkyrienSkiesMod;
+import org.valkyrienskies.mod.common.assembly.ShipAssemblyKt;
 import org.valkyrienskies.mod.common.util.DimensionIdProvider;
 
+import java.util.List;
+
 import static net.minecraft.state.property.Properties.HORIZONTAL_FACING;
 
 public class MotionInvokingBlockEntity extends BlockEntity {
@@ -38,7 +41,16 @@ public static void tick(World world, BlockPos pos, BlockState state, MotionInvok
         }
 
         if (be.instructions.isEmpty() && world.getGameRules().getBoolean(Pirates.PIRATES_IS_LIVE_WORLD)) {
-            be.getPattern("circle.pattern");
+
+            if(world.random.nextBoolean())
+            {
+                be.setPattern("circle.pattern");
+            }
+            else
+            {
+                be.setPattern("rcircle.pattern");
+            }
+
         }
         if (!world.isClient && world.getGameRules().getBoolean(Pirates.PIRATES_IS_LIVE_WORLD) && world.getTime() >= be.nextInstruction) {
             DimensionIdProvider provider = (DimensionIdProvider) world;
@@ -76,7 +88,8 @@ public static void tick(World world, BlockPos pos, BlockState state, MotionInvok
     }
 
     private void buildShipRec(ServerWorld world, BlockPos pos) {
-        ShipAssembler.INSTANCE.collectBlocks(world, pos, a -> !a.isAir() && !a.isOf(Blocks.WATER) && !a.isOf(Blocks.KELP) && !a.isOf(Blocks.KELP_PLANT) && !a.isOf(Blocks.SAND) && !a.isIn(BlockTags.ICE) && !a.isOf(Blocks.STONE));
+        //ShipAssembler.INSTANCE.collectBlocks(world, pos, a -> !a.isAir() && !a.isOf(Blocks.WATER) && !a.isOf(Blocks.KELP) && !a.isOf(Blocks.KELP_PLANT) && !a.isOf(Blocks.SAND) && !a.isIn(BlockTags.ICE) && !a.isOf(Blocks.STONE));
+        collectBlocks(world,pos);
     }
 
     @Override
@@ -94,7 +107,7 @@ public void readNbt(NbtCompound nbt) {
     }
 
 
-    public void getPattern(String loc) {
+    public void setPattern(String loc) {
         instructions = PatternProcessor.loadPattern(loc);
         nextInstruction = world.getTime() + 10;
         markDirty();
@@ -115,4 +128,44 @@ private void utiliseInternalPattern(SeatedControllingPlayer seatedControllingPla
         be.instructions.add(be.instructions.remove(0));
         be.markDirty();
     }
+
+    public void collectBlocks(ServerWorld world, BlockPos center)
+    {
+        sortDense(world,center);
+        if(SET.size()<5000)
+        {
+            ShipAssemblyKt.createNewShipWithBlocks(center, SET, world);
+        }
+    }
+
+    private static  final List<Block> a = List.of(Blocks.SAND,Blocks.STONE,Blocks.ICE,Blocks.PACKED_ICE,Blocks.BLUE_ICE,Blocks.KELP,Blocks.KELP_PLANT,Blocks.AIR,Blocks.WATER);
+    private static final DenseBlockPosSet SET = new DenseBlockPosSet();
+
+    public void sortDense(ServerWorld world, BlockPos here)
+    {
+        for (int i = -2; i < 3; i++) {
+            for (int j = -2; j < 3; j++) {
+                for (int k = -2; k < 3; k++) {
+                    //this means that we could hit 5000 in this loop, this is considered a false-start
+                    if(SET.getSize()<5000)
+                    {
+                        BlockPos o = here.add(i,j,k);
+                        if(!SET.contains(o.getX(),o.getY(),o.getZ()))
+                        {
+                            if(!a.contains(world.getBlockState(o).getBlock()))
+                            {
+                                SET.add(o.getX(),o.getY(),o.getZ());
+                                //System.out.println(SET.size());
+                                sortDense(world,o);
+                            }
+
+                        }
+                    }
+
+                }
+            }
+        }
+
+    }
+
 }

src/main/java/ace/actually/pirates/util/PatternProcessor.java

@@ -48,6 +48,15 @@ public static void setupBasicPatterns()
                 throw new RuntimeException(e);
             }
         }
+        file = new File(FabricLoader.getInstance().getConfigDirectory().getPath() + "/pirates/patterns/rcircle.pattern");
+        if(!file.exists())
+        {
+            try {
+                FileUtils.writeLines(file, Arrays.asList("forward 1 1","left 0.05 10"));
+            } catch (IOException e) {
+                throw new RuntimeException(e);
+            }
+        }
     }
 
 }