From ef4b0a563295fc555ef5af73d651109a1daa396a Mon Sep 17 00:00:00 2001 From: SquidDev Date: Mon, 13 Apr 2020 11:00:31 +0100 Subject: [PATCH] Fix config name for enabling http API It hasn't been http_enable for yonks - slightly worried I didn't notice this earlier. Also don't refer to ComputerCraft.cfg - the name has changed several times across versions, so let's leave it ambiguous. --- src/main/java/dan200/computercraft/shared/Config.java | 2 +- .../assets/computercraft/lua/rom/programs/http/pastebin.lua | 4 ++-- .../assets/computercraft/lua/rom/programs/http/wget.lua | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/main/java/dan200/computercraft/shared/Config.java b/src/main/java/dan200/computercraft/shared/Config.java index a58cd1962..65819e69e 100644 --- a/src/main/java/dan200/computercraft/shared/Config.java +++ b/src/main/java/dan200/computercraft/shared/Config.java @@ -175,7 +175,7 @@ public final class Config "for more fine grained control than this)" ); httpWebsocketEnable = config.get( CATEGORY_HTTP, "websocket_enabled", ComputerCraft.http_websocket_enable ); - httpWebsocketEnable.setComment( "Enable use of http websockets. This requires the \"http_enable\" option to also be true." ); + httpWebsocketEnable.setComment( "Enable use of http websockets. This requires the \"http.enabled\" option to also be true." ); httpAllowedDomains = config.get( CATEGORY_HTTP, "allowed_domains", DEFAULT_HTTP_WHITELIST ); httpAllowedDomains.setComment( "A list of wildcards for domains or IP ranges that can be accessed through the " + diff --git a/src/main/resources/assets/computercraft/lua/rom/programs/http/pastebin.lua b/src/main/resources/assets/computercraft/lua/rom/programs/http/pastebin.lua index 3e28a2f7a..49266c20e 100644 --- a/src/main/resources/assets/computercraft/lua/rom/programs/http/pastebin.lua +++ b/src/main/resources/assets/computercraft/lua/rom/programs/http/pastebin.lua @@ -13,8 +13,8 @@ if #tArgs < 2 then end if not http then - printError( "Pastebin requires http API" ) - printError( "Set http_enable to true in ComputerCraft.cfg" ) + printError( "Pastebin requires the http API" ) + printError( "Set http.enabled to true in CC: Tweaked's config" ) return end diff --git a/src/main/resources/assets/computercraft/lua/rom/programs/http/wget.lua b/src/main/resources/assets/computercraft/lua/rom/programs/http/wget.lua index e05def30e..6c5894e77 100644 --- a/src/main/resources/assets/computercraft/lua/rom/programs/http/wget.lua +++ b/src/main/resources/assets/computercraft/lua/rom/programs/http/wget.lua @@ -21,8 +21,8 @@ end local url = table.remove( tArgs, 1 ) if not http then - printError( "wget requires http API" ) - printError( "Set http_enable to true in ComputerCraft.cfg" ) + printError( "wget requires the http API" ) + printError( "Set http.enabled to true in CC: Tweaked's config" ) return end