From f2d09b8a9c3271134bf1b07731c03c2921a3afb8 Mon Sep 17 00:00:00 2001 From: Aran Roig Date: Tue, 6 Oct 2026 17:59:21 +0200 Subject: [PATCH] Thing --- README.md | 11 +++ gradlew | 0 .../com/aranroig/client/CodecraftClient.java | 9 ++ .../client/editor/CompletionProvider.java | 20 ++++- .../client/editor/EditorFileTree.java | 8 ++ .../client/editor/EditorFileView.java | 37 +++++++- .../aranroig/client/editor/EditorManager.java | 84 ++++++++++++++++--- .../aranroig/client/editor/EditorTopBar.java | 7 +- .../client/editor/LuaHighlighter.java | 2 +- src/main/java/com/aranroig/Codecraft.java | 66 +++++++++++++-- 10 files changed, 220 insertions(+), 24 deletions(-) mode change 100644 => 100755 gradlew diff --git a/README.md b/README.md index 3ae2dc1..374dd2d 100644 --- a/README.md +++ b/README.md @@ -1,5 +1,16 @@ # codecraft +Players write Lua in the in-game editor (`J` by default) and run it on the server. +Scripts can place and remove blocks through the `world` table: + +```lua +for y = 64, 67 do + world.set_block(10, y, -3, "minecraft:cobblestone") +end +``` + +The API is documented in [docs/lua-api.md](docs/lua-api.md). + ## Setup For setup instructions, please see the [Fabric Documentation page](https://docs.fabricmc.net/develop/getting-started/creating-a-project#setting-up) related to the IDE that you are using. diff --git a/gradlew b/gradlew old mode 100644 new mode 100755 diff --git a/src/client/java/com/aranroig/client/CodecraftClient.java b/src/client/java/com/aranroig/client/CodecraftClient.java index 6c55e7b..646289b 100644 --- a/src/client/java/com/aranroig/client/CodecraftClient.java +++ b/src/client/java/com/aranroig/client/CodecraftClient.java @@ -2,9 +2,12 @@ package com.aranroig.client; import com.aranroig.Codecraft; import com.aranroig.client.editor.EditorManager; +import com.aranroig.payloads.ClientboundProjectFilesPayload; +import com.aranroig.payloads.ClientboundSaveCodePayload; import com.mojang.blaze3d.platform.InputConstants; import net.fabricmc.api.ClientModInitializer; import net.fabricmc.fabric.api.client.event.lifecycle.v1.ClientTickEvents; +import net.fabricmc.fabric.api.client.networking.v1.ClientPlayNetworking; import net.minecraft.client.KeyMapping; import net.minecraft.resources.Identifier; import org.lwjgl.glfw.GLFW; @@ -35,6 +38,12 @@ public class CodecraftClient implements ClientModInitializer { EditorManager editorOverlay = new EditorManager(); + ClientPlayNetworking.registerGlobalReceiver(ClientboundProjectFilesPayload.TYPE, (payload, context) -> + editorOverlay.setFiles(payload.files())); + + ClientPlayNetworking.registerGlobalReceiver(ClientboundSaveCodePayload.TYPE, (payload, context) -> + editorOverlay.upsertFile(payload.data())); + ClientTickEvents.END_CLIENT_TICK.register(client -> { while(openEditor.consumeClick()){ if(client.player != null) { diff --git a/src/client/java/com/aranroig/client/editor/CompletionProvider.java b/src/client/java/com/aranroig/client/editor/CompletionProvider.java index 36ca99f..7543425 100644 --- a/src/client/java/com/aranroig/client/editor/CompletionProvider.java +++ b/src/client/java/com/aranroig/client/editor/CompletionProvider.java @@ -48,7 +48,7 @@ public class CompletionProvider { // ── Built-in global tables (as types) ──────────────────────────── for (String lib : new String[]{ "string", "table", "math", "io", "os", "coroutine", - "package", "utf8", "debug", "_G", "_VERSION" + "package", "utf8", "debug", "_G", "_VERSION", "world" }) items.add(CompletionItem.type(lib)); // ── Common snippets ─────────────────────────────────────────────── @@ -97,6 +97,15 @@ public class CompletionProvider { items.add(CompletionItem.snippet("print", "print()", "print(…)")); + items.add(CompletionItem.snippet("setblock", + "world.set_block(, , , \"minecraft:stone\")", + "world.set_block(…)")); + items.add(CompletionItem.snippet("removeblock", + "world.remove_block(, , )", + "world.remove_block(…)")); + items.add(CompletionItem.snippet("getblock", + "local block = world.get_block(, , )", + "world.get_block(…)")); items.add(CompletionItem.snippet("local", "local = ", "local variable")); @@ -217,6 +226,15 @@ public class CompletionProvider { }) coLib.add(CompletionItem.method(m[0], m[1])); libs.put("coroutine", coLib); + // world.* — block access provided by codecraft itself + List worldLib = new ArrayList<>(); + for (String[] m : new String[][]{ + {"set_block", "set_block(", "world.set_block(x, y, z, \"minecraft:stone\")"}, + {"remove_block", "remove_block(", "world.remove_block(x, y, z [,drops])"}, + {"get_block", "get_block(", "world.get_block(x, y, z)"}, + }) worldLib.add(CompletionItem.method(m[0], m[1])); + libs.put("world", worldLib); + LIBRARY_MEMBERS = Collections.unmodifiableMap(libs); } diff --git a/src/client/java/com/aranroig/client/editor/EditorFileTree.java b/src/client/java/com/aranroig/client/editor/EditorFileTree.java index 3ba9250..9ad98ec 100644 --- a/src/client/java/com/aranroig/client/editor/EditorFileTree.java +++ b/src/client/java/com/aranroig/client/editor/EditorFileTree.java @@ -43,6 +43,14 @@ public class EditorFileTree extends Widget { @Override public boolean handleMouseClicked(MouseButtonEvent event) { + Font font = editorScreen.getFont(); + int index = (int) ((event.y() - getStartY()) / font.lineHeight); + List files = editorManager.getFiles(); + + if (index >= 0 && index < files.size()) { + editorManager.openFile(files.get(index)); + return true; + } return false; } diff --git a/src/client/java/com/aranroig/client/editor/EditorFileView.java b/src/client/java/com/aranroig/client/editor/EditorFileView.java index 6a60f1b..c8cc5e2 100644 --- a/src/client/java/com/aranroig/client/editor/EditorFileView.java +++ b/src/client/java/com/aranroig/client/editor/EditorFileView.java @@ -720,8 +720,8 @@ public class EditorFileView extends Widget { scrollToCursor(); return true; } - case 256 -> { // Escape (no popup) - dismissCompletions(); + case 256 -> { // Escape (no popup) — close the editor + editorScreen.onClose(); return true; } case 32 -> { // Space @@ -764,10 +764,43 @@ public class EditorFileView extends Widget { case 83 -> { // Ctrl+S saveEditorFile(); } + case 291 -> { // F1 — open the docs on the word under the cursor + editorManager.openDocsAt(wordUnderCursor()); + return true; + } } return false; } + /** + * The identifier under or just left of the cursor, extended through a + * {@code .} or {@code :} prefix when there is one: {@code world.set_block}, + * {@code set_block}, {@code math} … + */ + private String wordUnderCursor() { + String content = text.toString(); + int end = Math.min(cursorPos, content.length()); + int start = end; + while (start > 0 + && (Character.isLetterOrDigit(content.charAt(start - 1)) || content.charAt(start - 1) == '_')) { + start--; + } + + // Include a "world." / "str:" prefix so qualified calls resolve. + int sep = start - 1; + if (sep >= 0 && (content.charAt(sep) == '.' || content.charAt(sep) == ':')) { + int prefixStart = sep; + while (prefixStart > 0 + && (Character.isLetterOrDigit(content.charAt(prefixStart - 1)) || content.charAt(prefixStart - 1) == '_')) { + prefixStart--; + } + if (prefixStart < sep) { + return content.substring(prefixStart, end); + } + } + return content.substring(start, end); + } + public void setEditorFile(EditorFile currentEditorFile) { this.currentEditorFile = currentEditorFile; text = new StringBuilder(currentEditorFile.getText()); diff --git a/src/client/java/com/aranroig/client/editor/EditorManager.java b/src/client/java/com/aranroig/client/editor/EditorManager.java index 829efd0..9aa54c9 100644 --- a/src/client/java/com/aranroig/client/editor/EditorManager.java +++ b/src/client/java/com/aranroig/client/editor/EditorManager.java @@ -4,6 +4,7 @@ import com.aranroig.SavedProjectData; import com.aranroig.client.wrapper.Logger; import com.aranroig.editor.EditorFile; import com.aranroig.editor.RunInfo; +import com.aranroig.payloads.ServerboundRequestProjectPayload; import com.aranroig.payloads.ServerboundRunCodePayload; import com.aranroig.payloads.ServerboundSaveCodePayload; import net.fabricmc.fabric.api.client.networking.v1.ClientPlayNetworking; @@ -21,8 +22,9 @@ public class EditorManager { EditorFileTree editorFileTree; EditorTopBar editorTopBar; EditorFileView editorFileView; + EditorDocsPanel editorDocsPanel; - List files; + List files = new ArrayList<>(); public EditorManager() { client = Minecraft.getInstance(); @@ -30,6 +32,7 @@ public class EditorManager { editorFileTree = new EditorFileTree(this); editorTopBar = new EditorTopBar(this); editorFileView = new EditorFileView(this); + editorDocsPanel = new EditorDocsPanel(this); } public List getFiles() { @@ -40,6 +43,8 @@ public class EditorManager { private final int TOP_BAR_HEIGHT = 12; public void toggleVisible() { + requestProjectFiles(); + TextEditorScreen textEditorScreen = new TextEditorScreen(); // Populate screen with widgets @@ -51,23 +56,80 @@ public class EditorManager { editorTopBar.addToEditorScreen(textEditorScreen); editorFileView.setSize(FILE_RENDER_WIDTH_SIZE, TOP_BAR_HEIGHT, -1, -1); - editorFileView.setEditorFile(files.getFirst()); + if (!files.isEmpty()) { + editorFileView.setEditorFile(files.getFirst()); + } editorFileView.addToEditorScreen(textEditorScreen); - /* - files = new ArrayList<>(); + // Full-screen modal docs layer, above every other widget; hidden until opened. + editorDocsPanel.setSize(0, 0, -1, -1); + editorDocsPanel.setZIndex(2); + editorDocsPanel.addToEditorScreen(textEditorScreen); + // Widgets are reused across opens: make sure a leftover docs modal isn't + // covering the editor, so the text editor really is the focused surface. + editorDocsPanel.close(); - // Add example file - EditorFile editorFile = new EditorFile("main.lua", ""); - files.add(editorFile); - - */ - - // De alguna forma cargar archivos de server + // Focus the text editor so typing works immediately on open. + textEditorScreen.selectedWidget = editorFileView; client.setScreenAndShow(textEditorScreen); } + /** Opens the Lua API documentation panel (top bar: Help → Lua API Documentation). */ + public void openDocs() { + editorDocsPanel.open(); + } + + /** + * Opens the documentation panel focused on a function name typed in the + * file view (F1), e.g. {@code "world.set_block"} or just {@code "set_block"}. + */ + public void openDocsAt(String word) { + editorDocsPanel.open(word); + } + + /** Asks the server for the current project files; the reply lands in {@link #setFiles(List)}. */ + public void requestProjectFiles() { + if (client.player == null) return; + ClientPlayNetworking.send(new ServerboundRequestProjectPayload()); + } + + /** Called on the client thread when the server sends the full project file list. */ + public void setFiles(List newFiles) { + files = new ArrayList<>(newFiles); + + EditorFile current = editorFileView.getCurrentEditorFile(); + EditorFile target = current != null ? findFile(current.getName()) : null; + if (target == null && !files.isEmpty()) { + target = files.getFirst(); + } + if (target != null) { + editorFileView.setEditorFile(target); + } + } + + /** Called on the client thread when another client saved a file on the server. */ + public void upsertFile(EditorFile file) { + EditorFile existing = findFile(file.getName()); + if (existing == null) { + files.add(file); + } else if (existing != editorFileView.getCurrentEditorFile()) { + // Don't clobber text the user is currently editing. + existing.setText(file.getText()); + } + } + + public EditorFile findFile(String name) { + for (EditorFile file : files) { + if (file.getName().equals(name)) return file; + } + return null; + } + + public void openFile(EditorFile file) { + editorFileView.setEditorFile(file); + } + public void newFile() { } diff --git a/src/client/java/com/aranroig/client/editor/EditorTopBar.java b/src/client/java/com/aranroig/client/editor/EditorTopBar.java index 9f871a2..87ed09a 100644 --- a/src/client/java/com/aranroig/client/editor/EditorTopBar.java +++ b/src/client/java/com/aranroig/client/editor/EditorTopBar.java @@ -35,7 +35,7 @@ public class EditorTopBar extends Widget { static MenuItem separator() { return new MenuItem("", true); } } - private static final String[] TAB_LABELS = { "File", "Edit", "Run" }; + private static final String[] TAB_LABELS = { "File", "Edit", "Run", "Help" }; private static final List> TAB_ITEMS = List.of( // File @@ -65,6 +65,10 @@ public class EditorTopBar extends Widget { MenuItem.item("Stop"), MenuItem.separator(), MenuItem.item("Build Project") + ), + // Help + List.of( + MenuItem.item("Lua API Documentation") ) ); @@ -236,6 +240,7 @@ public class EditorTopBar extends Widget { case "Redo" -> editorManager.redo(); case "Run Script" -> editorManager.run(); case "Stop" -> editorManager.stop(); + case "Lua API Documentation" -> editorManager.openDocs(); // Add remaining cases as needed default -> System.out.println("[TopBar] Clicked: " + item.label()); } diff --git a/src/client/java/com/aranroig/client/editor/LuaHighlighter.java b/src/client/java/com/aranroig/client/editor/LuaHighlighter.java index cc20c72..d2421f1 100644 --- a/src/client/java/com/aranroig/client/editor/LuaHighlighter.java +++ b/src/client/java/com/aranroig/client/editor/LuaHighlighter.java @@ -64,7 +64,7 @@ public class LuaHighlighter { private static final Set LIBRARIES = Set.of( "string", "table", "math", "io", "os", - "coroutine", "package", "utf8", "debug" + "coroutine", "package", "utf8", "debug", "world" ); // ── Public types ────────────────────────────────────────────────────── diff --git a/src/main/java/com/aranroig/Codecraft.java b/src/main/java/com/aranroig/Codecraft.java index 43a6291..05b8cec 100644 --- a/src/main/java/com/aranroig/Codecraft.java +++ b/src/main/java/com/aranroig/Codecraft.java @@ -1,18 +1,26 @@ package com.aranroig; import com.aranroig.editor.EditorFile; +import com.aranroig.payloads.ClientboundProjectFilesPayload; +import com.aranroig.payloads.ClientboundSaveCodePayload; +import com.aranroig.payloads.ServerboundRequestProjectPayload; import com.aranroig.payloads.ServerboundRunCodePayload; import com.aranroig.payloads.ServerboundSaveCodePayload; +import com.aranroig.wrapper.ChatLogger; +import com.aranroig.wrapper.WorldApi; import net.fabricmc.api.ModInitializer; import net.fabricmc.fabric.api.networking.v1.PayloadTypeRegistry; import net.fabricmc.fabric.api.networking.v1.ServerPlayNetworking; +import net.minecraft.network.chat.Component; import net.minecraft.resources.Identifier; import net.minecraft.server.MinecraftServer; -import net.minecraft.world.entity.vehicle.minecart.Minecart; +import net.minecraft.server.level.ServerPlayer; import org.slf4j.Logger; import org.slf4j.LoggerFactory; +import party.iroiro.luajava.Lua; +import party.iroiro.luajava.luaj.LuaJ; import java.util.List; @@ -24,8 +32,6 @@ public class Codecraft implements ModInitializer { // That way, it's clear which mod wrote info, warnings, and errors. public static final Logger LOGGER = LoggerFactory.getLogger(MOD_ID); - private List editorFiles; - @Override public void onInitialize() { // This code runs as soon as Minecraft is in a mod-load-ready state. @@ -35,6 +41,25 @@ public class Codecraft implements ModInitializer { PayloadTypeRegistry.serverboundPlay().register(ServerboundSaveCodePayload.TYPE, ServerboundSaveCodePayload.CODEC); PayloadTypeRegistry.serverboundPlay().register(ServerboundRunCodePayload.TYPE, ServerboundRunCodePayload.CODEC); + PayloadTypeRegistry.serverboundPlay().register(ServerboundRequestProjectPayload.TYPE, ServerboundRequestProjectPayload.CODEC); + PayloadTypeRegistry.clientboundPlay().register(ClientboundSaveCodePayload.TYPE, ClientboundSaveCodePayload.CODEC); + PayloadTypeRegistry.clientboundPlay().register(ClientboundProjectFilesPayload.TYPE, ClientboundProjectFilesPayload.CODEC); + + ServerPlayNetworking.registerGlobalReceiver(ServerboundRequestProjectPayload.TYPE, (payload, context) -> { + MinecraftServer server = context.player().level().getServer(); + if(server == null) return; + + SavedProjectData savedData = SavedProjectData.getSavedBlockData(server); + List files = savedData.getEditorFiles(); + + // Seed a default entrypoint so the client always has at least one file. + if(files.isEmpty()) { + files.add(new EditorFile("main.lua", "")); + savedData.setEditorFiles(files); + } + + ServerPlayNetworking.send(context.player(), new ClientboundProjectFilesPayload(List.copyOf(files))); + }); ServerPlayNetworking.registerGlobalReceiver(ServerboundSaveCodePayload.TYPE, (payload, context) -> { MinecraftServer server = context.player().level().getServer(); @@ -57,26 +82,51 @@ public class Codecraft implements ModInitializer { } savedData.setEditorFiles(files); - System.out.println("Successfully saved files"); + LOGGER.info("Successfully saved file {}", editorFile.getName()); + + // Push the change to every other client so their editors stay in sync. + for(ServerPlayer player : server.getPlayerList().getPlayers()) { + if(player != context.player()) { + ServerPlayNetworking.send(player, new ClientboundSaveCodePayload(new EditorFile(editorFile.getName(), editorFile.getText()))); + } + } }); ServerPlayNetworking.registerGlobalReceiver(ServerboundRunCodePayload.TYPE, (payload, context) -> { - // HERE MinecraftServer server = context.player().level().getServer(); if(server == null) return; + ServerPlayer player = context.player(); + SavedProjectData savedData = SavedProjectData.getSavedBlockData(server); List files = savedData.getEditorFiles(); String entrypoint = payload.data().getEntrypoint(); - System.out.println("Want to run the code " + payload.data().getEntrypoint()); + LOGGER.info("Running entrypoint {}", entrypoint); - // TODO: Run the entrypoint, might change later + EditorFile target = null; for(EditorFile file : files) { if(file.getName().equals(entrypoint)) { - System.out.println(file.getText()); + target = file; + break; } } + + if(target == null) { + player.sendSystemMessage(Component.literal("§ccodecraft: entrypoint not found: " + entrypoint)); + return; + } + + Lua lua = new LuaJ(); + lua.push(ChatLogger.print(player)); + lua.setGlobal("print"); + WorldApi.register(lua, player); + try { + lua.run(target.getText()); + } catch (Exception e) { + LOGGER.warn("Error running " + entrypoint, e); + player.sendSystemMessage(Component.literal("§ccodecraft error: " + e.getMessage())); + } }); }