Merge branch 'mc-1.15.x' into mc-1.16.x

.gitattributes

@@ -1,3 +1,15 @@
 # Ignore changes in generated files
 src/generated/resources/data/** linguist-generated
 src/test/server-files/structures linguist-generated
+
+* text=auto
+
+*.gradle eol=lf diff=java
+*.java   eol=lf diff=java
+*.kt     eol=lf diff=java
+*.lua    eol=lf
+*.md     eol=lf diff=markdown
+*.txt    eol=lf
+
+*.png binary
+*.jar binary

.github/ISSUE_TEMPLATE/bug_report.yaml

@@ -1,17 +1,17 @@
 name: Bug report
-about: Report some misbehaviour in the mod
+description: Report some misbehaviour in the mod
 labels: [ bug ]
 body:
 - type: dropdown
   id: mc-version
-  attributes: 
+  attributes:
     label: Minecraft Version
     description: What version of Minecraft are you using?
     options:
       - 1.15.x
       - 1.16.x
-    validations:
-      required: true
+  validations:
+    required: true
 - type: input
   id: version
   attributes:
@@ -24,7 +24,7 @@ body:
   id: details
   attributes:
     label: Details
-    description: | 
+    description: |
       Description of the bug. Please include the following:
       - Logs: These will be located in the `logs/` directory of your Minecraft
         instance. Please upload them as a gist or directly into this editor.

src/main/java/dan200/computercraft/ComputerCraft.java

@@ -36,7 +36,6 @@ public final class ComputerCraft
     public static int maximumFilesOpen = 128;
     public static boolean disableLua51Features = false;
     public static String defaultComputerSettings = "";
-    public static boolean debugEnable = true;
     public static boolean logComputerErrors = true;
     public static boolean commandRequireCreative = true;
 

src/main/java/dan200/computercraft/core/apis/http/websocket/Websocket.java

@@ -22,6 +22,7 @@ import io.netty.channel.ChannelPipeline;
 import io.netty.channel.socket.SocketChannel;
 import io.netty.channel.socket.nio.NioSocketChannel;
 import io.netty.handler.codec.http.HttpClientCodec;
+import io.netty.handler.codec.http.HttpHeaderNames;
 import io.netty.handler.codec.http.HttpHeaders;
 import io.netty.handler.codec.http.HttpObjectAggregator;
 import io.netty.handler.codec.http.websocketx.WebSocketClientHandshaker;
@@ -150,8 +151,9 @@ public class Websocket extends Resource<Websocket>
                             p.addLast( sslContext.newHandler( ch.alloc(), uri.getHost(), socketAddress.getPort() ) );
                         }
 
+                        String subprotocol = headers.get( HttpHeaderNames.SEC_WEBSOCKET_PROTOCOL );
                         WebSocketClientHandshaker handshaker = WebSocketClientHandshakerFactory.newHandshaker(
-                            uri, WebSocketVersion.V13, null, true, headers,
+                            uri, WebSocketVersion.V13, subprotocol, true, headers,
                             options.websocketMessage <= 0 ? MAX_MESSAGE_SIZE : options.websocketMessage
                         );
 

src/main/java/dan200/computercraft/core/lua/CobaltLuaMachine.java

@@ -97,7 +97,7 @@ public class CobaltLuaMachine implements ILuaMachine
         globals.load( state, new CoroutineLib() );
         globals.load( state, new Bit32Lib() );
         globals.load( state, new Utf8Lib() );
-        if( ComputerCraft.debugEnable ) globals.load( state, new DebugLib() );
+        globals.load( state, new DebugLib() );
 
         // Remove globals we don't want to expose
         globals.rawset( "collectgarbage", Constants.NIL );

src/main/java/dan200/computercraft/shared/Config.java

@@ -42,7 +42,6 @@ public final class Config
     private static final ConfigValue<Integer> maximumFilesOpen;
     private static final ConfigValue<Boolean> disableLua51Features;
     private static final ConfigValue<String> defaultComputerSettings;
-    private static final ConfigValue<Boolean> debugEnabled;
     private static final ConfigValue<Boolean> logComputerErrors;
     private static final ConfigValue<Boolean> commandRequireCreative;
 
@@ -120,10 +119,6 @@ public final class Config
                     "autocompletion" )
                 .define( "default_computer_settings", ComputerCraft.defaultComputerSettings );
 
-            debugEnabled = builder
-                .comment( "Enable Lua's debug library. This is sandboxed to each computer, so is generally safe to be used by players." )
-                .define( "debug_enabled", ComputerCraft.debugEnable );
-
             logComputerErrors = builder
                 .comment( "Log exceptions thrown by peripherals and other Lua objects.\n" +
                     "This makes it easier for mod authors to debug problems, but may result in log spam should people use buggy methods." )
@@ -317,7 +312,6 @@ public final class Config
         ComputerCraft.maximumFilesOpen = maximumFilesOpen.get();
         ComputerCraft.disableLua51Features = disableLua51Features.get();
         ComputerCraft.defaultComputerSettings = defaultComputerSettings.get();
-        ComputerCraft.debugEnable = debugEnabled.get();
         ComputerCraft.computerThreads = computerThreads.get();
         ComputerCraft.logComputerErrors = logComputerErrors.get();
         ComputerCraft.commandRequireCreative = commandRequireCreative.get();

src/main/resources/data/computercraft/lua/rom/modules/main/cc/expect.lua

@@ -51,10 +51,8 @@ local function expect(index, value, ...)
 
     -- If we can determine the function name with a high level of confidence, try to include it.
     local name
-    if native_type(debug) == "table" and native_type(debug.getinfo) == "function" then
-        local ok, info = pcall(debug.getinfo, 3, "nS")
-        if ok and info.name and info.name ~= "" and info.what ~= "C" then name = info.name end
-    end
+    local ok, info = pcall(debug.getinfo, 3, "nS")
+    if ok and info.name and info.name ~= "" and info.what ~= "C" then name = info.name end
 
     local type_names = get_type_names(...)
     if name then
@@ -94,7 +92,7 @@ end
 
 --- Expect a number to be within a specific range.
 --
--- @tparam number num, The value to check.
+-- @tparam number num The value to check.
 -- @tparam number min The minimum value, if nil then `-math.huge` is used.
 -- @tparam number max The maximum value, if nil then `math.huge` is used.
 -- @return The given `value`.

src/main/resources/data/computercraft/lua/rom/modules/main/cc/pretty.lua

@@ -28,8 +28,7 @@ local expect = require "cc.expect"
 local expect, field = expect.expect, expect.field
 
 local type, getmetatable, setmetatable, colours, str_write, tostring = type, getmetatable, setmetatable, colours, write, tostring
-local debug_info = type(debug) == "table" and type(debug.getinfo) == "function" and debug.getinfo
-local debug_local = type(debug) == "table" and type(debug.getlocal) == "function" and debug.getlocal
+local debug_info, debug_local = debug.getinfo, debug.getlocal
 
 --- @{table.insert} alternative, but with the length stored inline.
 local function append(out, value)