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

src/main/java/dan200/computercraft/client/gui/GuiTurtle.java

@@ -56,9 +56,6 @@ public class GuiTurtle extends ComputerScreenBase<ContainerTurtle>
         minecraft.getTextureManager().bind( advanced ? BACKGROUND_ADVANCED : BACKGROUND_NORMAL );
         blit( transform, leftPos + ComputerSidebar.WIDTH, topPos, 0, 0, TEX_WIDTH, TEX_HEIGHT );
 
-        minecraft.getTextureManager().bind( advanced ? ComputerBorderRenderer.BACKGROUND_ADVANCED : ComputerBorderRenderer.BACKGROUND_NORMAL );
-        ComputerSidebar.renderBackground( transform, leftPos, topPos + sidebarYOffset );
-
         int slot = getMenu().getSelectedSlot();
         if( slot >= 0 )
         {
@@ -70,5 +67,8 @@ public class GuiTurtle extends ComputerScreenBase<ContainerTurtle>
                 0, 217, 24, 24
             );
         }
+
+        minecraft.getTextureManager().bind( advanced ? ComputerBorderRenderer.BACKGROUND_ADVANCED : ComputerBorderRenderer.BACKGROUND_NORMAL );
+        ComputerSidebar.renderBackground( transform, leftPos, topPos + sidebarYOffset );
     }
 }

src/main/java/dan200/computercraft/shared/network/client/TerminalState.java

@@ -126,7 +126,7 @@ public class TerminalState
         if( !compress ) return buffer;
         if( compressed != null ) return compressed;
 
-        ByteBuf compressed = Unpooled.directBuffer();
+        ByteBuf compressed = Unpooled.buffer();
         OutputStream stream = null;
         try
         {

src/main/java/dan200/computercraft/shared/peripheral/diskdrive/TileDiskDrive.java

@@ -442,7 +442,7 @@ public final class TileDiskDrive extends TileGeneric implements DefaultInventory
 
     private void updateBlockState()
     {
-        if( remove ) return;
+        if( remove || level == null ) return;
 
         if( !diskStack.isEmpty() )
         {

src/main/java/dan200/computercraft/shared/peripheral/printer/TilePrinter.java

@@ -438,7 +438,7 @@ public final class TilePrinter extends TileGeneric implements DefaultSidedInvent
 
     private void updateBlockState( boolean top, boolean bottom )
     {
-        if( remove ) return;
+        if( remove || level == null ) return;
 
         BlockState state = getBlockState();
         if( state.getValue( BlockPrinter.TOP ) == top & state.getValue( BlockPrinter.BOTTOM ) == bottom ) return;

src/main/resources/data/computercraft/lua/bios.lua

@@ -681,6 +681,7 @@ if http then
     local nativeCheckURL = http.checkURL
     http.checkURLAsync = nativeCheckURL
     http.checkURL = function(_url)
+        expect(1, _url, "string")
         local ok, err = nativeCheckURL(_url)
         if not ok then return ok, err end
 

src/main/resources/data/computercraft/lua/rom/motd.txt

@@ -21,3 +21,4 @@ The "equip" programs let you add upgrades to a turtle without crafting.
 You can change the color of a disk by crafting or right clicking it with dye.
 You can print on a printed page again to get multiple colors.
 Holding the Ctrl and T keys terminates the running program.
+You can drag and drop files onto an open computer to upload them.