Add translations for HTTP proxy config

projects/common/src/main/java/dan200/computercraft/data/LanguageProvider.java

@@ -230,6 +230,11 @@ public final class LanguageProvider implements DataProvider {
         addConfigEntry(ConfigSpec.httpDownloadBandwidth, "Global download limit");
         addConfigEntry(ConfigSpec.httpUploadBandwidth, "Global upload limit");
 
+        addConfigGroup(ConfigSpec.serverSpec, "http.proxy", "Proxy");
+        addConfigEntry(ConfigSpec.httpProxyHost, "Host name");
+        addConfigEntry(ConfigSpec.httpProxyPort, "Port");
+        addConfigEntry(ConfigSpec.httpProxyType, "Proxy type");
+
         addConfigGroup(ConfigSpec.serverSpec, "peripheral", "Peripherals");
         addConfigEntry(ConfigSpec.commandBlockEnabled, "Enable command block peripheral");
         addConfigEntry(ConfigSpec.modemRange, "Modem range (default)");

projects/common/src/main/java/dan200/computercraft/shared/command/CommandComputerCraft.java

@@ -213,8 +213,10 @@ public final class CommandComputerCraft {
                         getMetricsInstance(context.getSource()).start();
 
                         var stopCommand = "/computercraft track stop";
-                        Object[] args = new Object[]{ link(text(stopCommand), stopCommand, Component.translatable("commands.computercraft.track.stop.action")) };
+                        context.getSource().sendSuccess(Component.translatable(
-                        context.getSource().sendSuccess(Component.translatable("commands.computercraft.track.start.stop", args), false);
+                            "commands.computercraft.track.start.stop",
+                            link(text(stopCommand), stopCommand, Component.translatable("commands.computercraft.track.stop.action"))
+                        ), false);
                         return 1;
                     }))
 

projects/fabric/src/generated/resources/assets/computercraft/lang/en_us.json

@@ -104,6 +104,14 @@
   "gui.computercraft.config.http.max_requests.tooltip": "The number of http requests a computer can make at one time. Additional requests\nwill be queued, and sent when the running requests have finished. Set to 0 for\nunlimited.\nRange: > 0",
   "gui.computercraft.config.http.max_websockets": "Maximum concurrent websockets",
   "gui.computercraft.config.http.max_websockets.tooltip": "The number of websockets a computer can have open at one time. Set to 0 for unlimited.\nRange: > 1",
+  "gui.computercraft.config.http.proxy": "Proxy",
+  "gui.computercraft.config.http.proxy.host": "Host name",
+  "gui.computercraft.config.http.proxy.host.tooltip": "The hostname or IP address of the proxy server.",
+  "gui.computercraft.config.http.proxy.port": "Port",
+  "gui.computercraft.config.http.proxy.port.tooltip": "The port of the proxy server.\nRange: 1 ~ 65536",
+  "gui.computercraft.config.http.proxy.tooltip": "Tunnels HTTP and websocket requests through a proxy server. Only affects HTTP\nrules with \"use_proxy\" set to true (off by default).\nIf authentication is required for the proxy, create a \"computercraft-proxy.pw\"\nfile in the same directory as \"computercraft-server.toml\", containing the\nusername and password separated by a colon, e.g. \"myuser:mypassword\". For\nSOCKS4 proxies only the username is required.",
+  "gui.computercraft.config.http.proxy.type": "Proxy type",
+  "gui.computercraft.config.http.proxy.type.tooltip": "The type of proxy to use.\nAllowed Values: HTTP, HTTPS, SOCKS4, SOCKS5",
   "gui.computercraft.config.http.rules": "Allow/deny rules",
   "gui.computercraft.config.http.rules.tooltip": "A list of rules which control behaviour of the \"http\" API for specific domains or\nIPs. Each rule is an item with a 'host' to match against, and a series of\nproperties. Rules are evaluated in order, meaning earlier rules override later\nones.\nThe host may be a domain name (\"pastebin.com\"), wildcard (\"*.pastebin.com\") or\nCIDR notation (\"127.0.0.0/8\").\nIf no rules, the domain is blocked.",
   "gui.computercraft.config.http.tooltip": "Controls the HTTP API",

projects/forge/src/generated/resources/assets/computercraft/lang/en_us.json

@@ -104,6 +104,14 @@
   "gui.computercraft.config.http.max_requests.tooltip": "The number of http requests a computer can make at one time. Additional requests\nwill be queued, and sent when the running requests have finished. Set to 0 for\nunlimited.\nRange: > 0",
   "gui.computercraft.config.http.max_websockets": "Maximum concurrent websockets",
   "gui.computercraft.config.http.max_websockets.tooltip": "The number of websockets a computer can have open at one time. Set to 0 for unlimited.\nRange: > 1",
+  "gui.computercraft.config.http.proxy": "Proxy",
+  "gui.computercraft.config.http.proxy.host": "Host name",
+  "gui.computercraft.config.http.proxy.host.tooltip": "The hostname or IP address of the proxy server.",
+  "gui.computercraft.config.http.proxy.port": "Port",
+  "gui.computercraft.config.http.proxy.port.tooltip": "The port of the proxy server.\nRange: 1 ~ 65536",
+  "gui.computercraft.config.http.proxy.tooltip": "Tunnels HTTP and websocket requests through a proxy server. Only affects HTTP\nrules with \"use_proxy\" set to true (off by default).\nIf authentication is required for the proxy, create a \"computercraft-proxy.pw\"\nfile in the same directory as \"computercraft-server.toml\", containing the\nusername and password separated by a colon, e.g. \"myuser:mypassword\". For\nSOCKS4 proxies only the username is required.",
+  "gui.computercraft.config.http.proxy.type": "Proxy type",
+  "gui.computercraft.config.http.proxy.type.tooltip": "The type of proxy to use.\nAllowed Values: HTTP, HTTPS, SOCKS4, SOCKS5",
   "gui.computercraft.config.http.rules": "Allow/deny rules",
   "gui.computercraft.config.http.rules.tooltip": "A list of rules which control behaviour of the \"http\" API for specific domains or\nIPs. Each rule is an item with a 'host' to match against, and a series of\nproperties. Rules are evaluated in order, meaning earlier rules override later\nones.\nThe host may be a domain name (\"pastebin.com\"), wildcard (\"*.pastebin.com\") or\nCIDR notation (\"127.0.0.0/8\").\nIf no rules, the domain is blocked.",
   "gui.computercraft.config.http.tooltip": "Controls the HTTP API",