make placer use free space

Author: GeorgeRNG

gradle.properties

@@ -8,7 +8,7 @@ yarn_mappings=1.20.2+build.4
 loader_version=0.14.24
 
 # Mod Properties
-mod_version=1.5.7
+mod_version=1.5.8
 maven_group=dev.dfonline
 archives_base_name=CodeClient
 

src/main/java/dev/dfonline/codeclient/Commands.java

@@ -204,17 +204,14 @@ public static void register(CommandDispatcher<FabricClientCommandSource> dispatc
 //            return -1;
 //        }));
         dispatcher.register(literal("placetemplates").executes(context -> {
-            if(CodeClient.location instanceof Dev dev) {
-                var map = new HashMap<BlockPos, ItemStack>();
-                BlockPos pos = dev.findFreePlacePos();
-                for (var template: Utility.templatesInInventory()) {
-                    map.put(pos, template);
-                    pos = dev.findFreePlacePos(pos.west(2));
-                }
-                CodeClient.currentAction = new PlaceTemplates(map, () -> {
+            if(CodeClient.location instanceof Dev) {
+                var action = Utility.createPlacer(Utility.templatesInInventory(), () -> {
                     CodeClient.currentAction = new None();
                     Utility.sendMessage("Done!", ChatType.SUCCESS);
                 });
+                if(action == null) return -1;
+                CodeClient.currentAction = action;
+                CodeClient.currentAction.init();
                 return 0;
             }
             Utility.sendMessage("You must be in dev mode!",ChatType.FAIL);

src/main/java/dev/dfonline/codeclient/Utility.java

@@ -3,6 +3,7 @@
 import com.google.gson.JsonObject;
 import com.google.gson.JsonParser;
 import dev.dfonline.codeclient.action.Action;
+import dev.dfonline.codeclient.action.None;
 import dev.dfonline.codeclient.action.impl.PlaceTemplates;
 import dev.dfonline.codeclient.hypercube.template.Template;
 import dev.dfonline.codeclient.hypercube.template.TemplateBlock;
@@ -149,6 +150,23 @@ public static PlaceTemplates createSwapper(List<ItemStack> templates, Action.Cal
         return null;
     }
 
+    /**
+     * A regular placer will always start from where code starts.
+     * This will use any free spaces instead.
+     */
+    public static PlaceTemplates createPlacer(List<ItemStack> templates, Action.Callback callback) {
+        if(CodeClient.location instanceof Dev dev) {
+            var map = new HashMap<BlockPos, ItemStack>();
+            BlockPos pos = dev.findFreePlacePos();
+            for (var template: templates) {
+                map.put(pos, template);
+                pos = dev.findFreePlacePos(pos.west(2));
+            }
+            CodeClient.currentAction = new PlaceTemplates(map, callback);
+        }
+        return null;
+    }
+
     public static void sendHandItem(ItemStack item) {
         CodeClient.MC.getNetworkHandler().sendPacket(new CreativeInventoryActionC2SPacket(36 + CodeClient.MC.player.getInventory().selectedSlot, item));
     }

src/main/java/dev/dfonline/codeclient/websocket/SocketHandler.java

@@ -216,11 +216,12 @@ private static class Place extends SocketHandler.Action {
         @Override
         public void start(WebSocket responder) {
             if(!ready) return;
-            CodeClient.currentAction = new PlaceTemplates(templates, () -> {
+            var placer = Utility.createPlacer(templates, () -> {
                 CodeClient.currentAction = new None();
                 if(responder.isOpen()) responder.send("place done");
-                next();
-            });
+                next();});
+            if(placer == null) return;
+            CodeClient.currentAction = placer;
             CodeClient.currentAction.init();
         }