Update datapack initialization to use scheduled function calls #18
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change | ||||
|---|---|---|---|---|---|---|
|
|
@@ -3,7 +3,7 @@ | |||||
| "templates": { | ||||||
| "pack.mcmeta": "{\n \"pack\": {\n \"pack_format\": {{pack_format}},\n \"supported_formats\": [61, 61],\n \"description\": \"{{packDescription}}\"\n }\n}", | ||||||
| "datapack.init.header": "################################################################\n# #\n# default init.mcfunction file generated by Minecraft-Script #\n# #\n################################################################\n", | ||||||
| "datapack.init": "scoreboard objectives add mcs_math dummy \"Minecraft-Script Math\"\nscoreboard objectives add mcs_click {{clickScoreboardCriterion}} \"Minecraft-Script Click\"\n\nschedule function {{datapack_id}}:user_functions/init 20t", | ||||||
|
There was a problem hiding this comment. P2: Delaying Prompt for AI agents
Suggested change
|
||||||
| "datapack.main.header": "################################################################\n# #\n# default main.mcfunction file generated by Minecraft-Script #\n# #\n################################################################\n", | ||||||
| "datapack.main": "function {{datapack_id}}:user_functions/main", | ||||||
| "datapack.kill.header": "################################################################\n# #\n# default kill.mcfunction file generated by Minecraft-Script #\n# #\n################################################################\n", | ||||||
|
|
||||||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change | ||||
|---|---|---|---|---|---|---|
|
|
@@ -3,7 +3,7 @@ | |||||
| "templates": { | ||||||
| "pack.mcmeta": "{\n \"pack\": {\n \"pack_format\": {{pack_format}},\n \"supported_formats\": [71, 71],\n \"description\": \"{{packDescription}}\"\n }\n}", | ||||||
| "datapack.init.header": "################################################################\n# #\n# default init.mcfunction file generated by Minecraft-Script #\n# #\n################################################################\n", | ||||||
| "datapack.init": "scoreboard objectives add mcs_math dummy \"Minecraft-Script Math\"\nscoreboard objectives add mcs_click {{clickScoreboardCriterion}} \"Minecraft-Script Click\"\n\nschedule function {{datapack_id}}:user_functions/init 20t", | ||||||
|
There was a problem hiding this comment. P1: Delaying Prompt for AI agents
Suggested change
|
||||||
| "datapack.main.header": "################################################################\n# #\n# default main.mcfunction file generated by Minecraft-Script #\n# #\n################################################################\n", | ||||||
| "datapack.main": "function {{datapack_id}}:user_functions/main", | ||||||
| "datapack.kill.header": "################################################################\n# #\n# default kill.mcfunction file generated by Minecraft-Script #\n# #\n################################################################\n", | ||||||
|
|
||||||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change | ||||
|---|---|---|---|---|---|---|
|
|
@@ -3,7 +3,7 @@ | |||||
| "templates": { | ||||||
| "pack.mcmeta": "{\n \"pack\": {\n \"pack_format\": {{pack_format}},\n \"supported_formats\": [80, 80],\n \"description\": \"{{packDescription}}\"\n }\n}", | ||||||
| "datapack.init.header": "################################################################\n# #\n# default init.mcfunction file generated by Minecraft-Script #\n# #\n################################################################\n", | ||||||
| "datapack.init": "scoreboard objectives add mcs_math dummy \"Minecraft-Script Math\"\nscoreboard objectives add mcs_click {{clickScoreboardCriterion}} \"Minecraft-Script Click\"\n\nschedule function {{datapack_id}}:user_functions/init 20t", | ||||||
|
There was a problem hiding this comment. P2: Deferring Prompt for AI agents
Suggested change
|
||||||
| "datapack.main.header": "################################################################\n# #\n# default main.mcfunction file generated by Minecraft-Script #\n# #\n################################################################\n", | ||||||
| "datapack.main": "function {{datapack_id}}:user_functions/main", | ||||||
| "datapack.kill.header": "################################################################\n# #\n# default kill.mcfunction file generated by Minecraft-Script #\n# #\n################################################################\n", | ||||||
|
|
||||||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -3,7 +3,7 @@ | |
| "templates": { | ||
| "pack.mcmeta": "{\n \"pack\": {\n \"pack_format\": {{pack_format}},\n \"supported_formats\": [81, 81],\n \"description\": \"{{packDescription}}\"\n }\n}", | ||
| "datapack.init.header": "################################################################\n# #\n# default init.mcfunction file generated by Minecraft-Script #\n# #\n################################################################\n", | ||
| "datapack.init": "scoreboard objectives add mcs_math dummy \"Minecraft-Script Math\"\nscoreboard objectives add mcs_click {{clickScoreboardCriterion}} \"Minecraft-Script Click\"\n\nschedule function {{datapack_id}}:user_functions/init 20t", | ||
| "datapack.main.header": "################################################################\n# #\n# default main.mcfunction file generated by Minecraft-Script #\n# #\n################################################################\n", | ||
| "datapack.main": "function {{datapack_id}}:user_functions/main", | ||
| "datapack.kill.header": "################################################################\n# #\n# default kill.mcfunction file generated by Minecraft-Script #\n# #\n################################################################\n", | ||
|
|
||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change | ||||
|---|---|---|---|---|---|---|
|
|
@@ -3,7 +3,7 @@ | |||||
| "templates": { | ||||||
| "pack.mcmeta": "{\n \"pack\": {\n \"min_format\": [{{formatMinMajor}}, {{formatMinMinor}}],\n \"max_format\": [{{formatMaxMajor}}, {{formatMaxMinor}}],\n \"description\": \"{{packDescription}}\"\n }\n}", | ||||||
| "datapack.init.header": "################################################################\n# #\n# default init.mcfunction file generated by Minecraft-Script #\n# #\n################################################################\n", | ||||||
| "datapack.init": "scoreboard objectives add mcs_math dummy \"Minecraft-Script Math\"\nscoreboard objectives add mcs_click {{clickScoreboardCriterion}} \"Minecraft-Script Click\"\n\nschedule function {{datapack_id}}:user_functions/init 20t", | ||||||
|
There was a problem hiding this comment. P2: Delaying Prompt for AI agents
Suggested change
|
||||||
| "datapack.main.header": "################################################################\n# #\n# default main.mcfunction file generated by Minecraft-Script #\n# #\n################################################################\n", | ||||||
| "datapack.main": "function {{datapack_id}}:user_functions/main", | ||||||
| "datapack.kill.header": "################################################################\n# #\n# default kill.mcfunction file generated by Minecraft-Script #\n# #\n################################################################\n", | ||||||
|
|
||||||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change | ||||
|---|---|---|---|---|---|---|
|
|
@@ -3,7 +3,7 @@ | |||||
| "templates": { | ||||||
| "pack.mcmeta": "{\n \"pack\": {\n \"min_format\": [{{formatMinMajor}}, {{formatMinMinor}}],\n \"max_format\": [{{formatMaxMajor}}, {{formatMaxMinor}}],\n \"description\": \"{{packDescription}}\"\n }\n}", | ||||||
| "datapack.init.header": "################################################################\n# #\n# default init.mcfunction file generated by Minecraft-Script #\n# #\n################################################################\n", | ||||||
| "datapack.init": "scoreboard objectives add mcs_math dummy \"Minecraft-Script Math\"\nscoreboard objectives add mcs_click {{clickScoreboardCriterion}} \"Minecraft-Script Click\"\n\nschedule function {{datapack_id}}:user_functions/init 20t", | ||||||
|
There was a problem hiding this comment. P1: Delaying Prompt for AI agents
Suggested change
|
||||||
| "datapack.main.header": "################################################################\n# #\n# default main.mcfunction file generated by Minecraft-Script #\n# #\n################################################################\n", | ||||||
| "datapack.main": "function {{datapack_id}}:user_functions/main", | ||||||
| "datapack.kill.header": "################################################################\n# #\n# default kill.mcfunction file generated by Minecraft-Script #\n# #\n################################################################\n", | ||||||
|
|
||||||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,18 @@ | ||
| package dev.spyc0der.minecraftscript; | ||
|
|
||
| public record McsCommandResult(boolean success, String message) { | ||
| public static McsCommandResult ok(String message) { | ||
| return new McsCommandResult(true, message); | ||
| } | ||
|
|
||
| public static McsCommandResult error(String message) { | ||
| return new McsCommandResult(false, message); | ||
| } | ||
|
|
||
| public McsCommandResult acknowledged(String command) { | ||
| String prefix = command == null || command.isBlank() | ||
| ? "MCS command acknowledged: " | ||
| : "MCS command acknowledged: " + command + ": "; | ||
| return new McsCommandResult(success, prefix + message); | ||
| } | ||
| } |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,115 @@ | ||
| package dev.spyc0der.minecraftscript; | ||
|
|
||
| import java.io.IOException; | ||
| import java.util.List; | ||
|
|
||
| public final class McsCommandService { | ||
| private McsCommandService() { | ||
| } | ||
|
|
||
| public static List<String> packNameSuggestions() { | ||
| McsWorldPackManager packManager = McsModRuntime.packManager(); | ||
| if (packManager == null) { | ||
| return List.of(); | ||
| } | ||
| try { | ||
| return packManager.discoverPackNames(); | ||
| } catch (IOException error) { | ||
| return List.of(); | ||
| } | ||
| } | ||
|
|
||
| public static McsCommandResult setHotReloading(boolean enabled, String packName) { | ||
| McsWorldPackManager packManager = McsModRuntime.packManager(); | ||
| if (packManager == null) { | ||
| return McsCommandResult.error("Minecraft Script is not active on this server."); | ||
| } | ||
| try { | ||
| McsCommandResult result = packManager.setHotReloading(enabled, packName); | ||
| if (result.success() && (packName == null || packName.isBlank())) { | ||
| McsModRuntime.applyHotReloadState(enabled); | ||
| } | ||
| return result; | ||
| } catch (IOException error) { | ||
| return McsCommandResult.error("Could not save MCS config: " + error.getMessage()); | ||
| } | ||
| } | ||
|
|
||
| public static McsCommandResult setPackEnabled(String packName, boolean enabled) { | ||
| McsWorldPackManager packManager = McsModRuntime.packManager(); | ||
| McsServerAccess serverAccess = McsModRuntime.serverAccess(); | ||
| if (packManager == null || serverAccess == null) { | ||
| return McsCommandResult.error("Minecraft Script is not active on this server."); | ||
| } | ||
| try { | ||
| McsCommandResult result = packManager.setPackEnabled(packName, enabled); | ||
|
There was a problem hiding this comment. P2: Prompt for AI agents |
||
| if (result.success()) { | ||
| serverAccess.executeReload(); | ||
| } | ||
| return result; | ||
| } catch (IOException error) { | ||
| return McsCommandResult.error("Could not update pack state: " + error.getMessage()); | ||
| } | ||
| } | ||
|
|
||
| public static McsCommandResult listPacks() { | ||
| McsWorldPackManager packManager = McsModRuntime.packManager(); | ||
| if (packManager == null) { | ||
| return McsCommandResult.error("Minecraft Script is not active on this server."); | ||
| } | ||
| try { | ||
| return packManager.listPacks(); | ||
| } catch (IOException error) { | ||
| return McsCommandResult.error("Could not list MCS packs: " + error.getMessage()); | ||
| } | ||
| } | ||
|
|
||
| public static McsCommandResult createPack(String packName, String scope) { | ||
| McsWorldPackManager packManager = McsModRuntime.packManager(); | ||
| McsServerAccess serverAccess = McsModRuntime.serverAccess(); | ||
| if (packManager == null || serverAccess == null) { | ||
| return McsCommandResult.error("Minecraft Script is not active on this server."); | ||
| } | ||
| McsPackSource source = parsePackScope(scope); | ||
| if (source == null) { | ||
| return McsCommandResult.error("Scope must be 'global' or 'local'."); | ||
| } | ||
| try { | ||
| McsCommandResult result = packManager.createPack(packName, source); | ||
| if (result.success()) { | ||
| serverAccess.executeReload(); | ||
| } | ||
| return result; | ||
| } catch (IOException error) { | ||
| return McsCommandResult.error("Could not create MCS pack: " + error.getMessage()); | ||
| } | ||
| } | ||
|
|
||
| private static McsPackSource parsePackScope(String scope) { | ||
| if (scope == null) { | ||
| return null; | ||
| } | ||
| return switch (scope.trim().toLowerCase()) { | ||
| case "global" -> McsPackSource.GLOBAL; | ||
| case "local" -> McsPackSource.WORLD; | ||
| default -> null; | ||
| }; | ||
| } | ||
|
|
||
| public static McsCommandResult reload(String packName) { | ||
| McsWorldPackManager packManager = McsModRuntime.packManager(); | ||
| McsServerAccess serverAccess = McsModRuntime.serverAccess(); | ||
| if (packManager == null || serverAccess == null) { | ||
| return McsCommandResult.error("Minecraft Script is not active on this server."); | ||
| } | ||
| try { | ||
| McsCommandResult result = packManager.reload(packName); | ||
| if (result.success()) { | ||
| serverAccess.executeReload(); | ||
| } | ||
| return result; | ||
| } catch (IOException error) { | ||
| return McsCommandResult.error("Could not reload MCS packs: " + error.getMessage()); | ||
| } | ||
| } | ||
| } | ||
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Uh oh!
There was an error while loading. Please reload this page.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
P2: Scheduling
user_functions/init20 ticks later allowsmainto run before initialization completes, introducing an init/main ordering race.Prompt for AI agents