mirrors/CC-Tweaked
1
0
Fork 0
mirror of https://github.com/SquidDev-CC/CC-Tweaked synced 2025-01-15 03:35:42 +00:00
Code Issues Releases Wiki Activity

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

Browse Source
This commit is contained in:
Jonathan Coates 2021-07-15 13:05:31 +01:00
commit 999a39a3e6
No known key found for this signature in database
GPG Key ID: B9E431FF07C98D06
6 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/main/java/dan200/computercraft/client/gui/GuiTurtle.java
View File

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

2
src/main/java/dan200/computercraft/shared/network/client/TerminalState.java
View File

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

2
src/main/java/dan200/computercraft/shared/peripheral/diskdrive/TileDiskDrive.java
View File

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

2
src/main/java/dan200/computercraft/shared/peripheral/printer/TilePrinter.java
View File

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

1
src/main/resources/data/computercraft/lua/bios.lua
View File

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

1
src/main/resources/data/computercraft/lua/rom/motd.txt
View File

@ -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 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. You can print on a printed page again to get multiple colors.
Holding the Ctrl and T keys terminates the running program. Holding the Ctrl and T keys terminates the running program.
You can drag and drop files onto an open computer to upload them.