mirrors/CC-Tweaked
1
0
Fork 0
mirror of https://github.com/SquidDev-CC/CC-Tweaked synced 2024-12-14 12:10:30 +00:00
Code Issues Releases Wiki Activity

Fix monitor resize checks being entirely wrong

Browse Source 
Fixes #879
This commit is contained in:
Jonathan Coates 2021-08-02 18:45:41 +01:00
parent e84ddef877
commit 96316cddaa
No known key found for this signature in database
GPG Key ID: B9E431FF07C98D06
4 changed files with 11 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
gradle.properties
View File

@ -1,5 +1,5 @@
# Mod properties # Mod properties
mod_version=1.98.0 mod_version=1.98.1
# Minecraft properties (update mods.toml when changing) # Minecraft properties (update mods.toml when changing)
mc_version=1.16.5 mc_version=1.16.5

8
src/main/java/dan200/computercraft/shared/peripheral/monitor/TileMonitor.java
View File

@ -641,12 +641,7 @@ public class TileMonitor extends TileGeneric
private boolean checkMonitorAt( int xIndex, int yIndex ) private boolean checkMonitorAt( int xIndex, int yIndex )
{ {
BlockPos pos = getBlockPos(); MonitorState state = getNeighbour( xIndex, yIndex );
Direction right = getRight();
Direction down = getDown();
MonitorState state = getSimilarMonitorAt( pos.relative( right, xIndex ).relative( down, yIndex ) );
if( state.isMissing() ) return false; if( state.isMissing() ) return false;
TileMonitor monitor = state.getMonitor(); TileMonitor monitor = state.getMonitor();
@ -667,6 +662,7 @@ public class TileMonitor extends TileGeneric
// Something in our monitor is invalid. For now, let's just reset ourselves and then try to integrate ourselves // Something in our monitor is invalid. For now, let's just reset ourselves and then try to integrate ourselves
// later. // later.
ComputerCraft.log.warn( "Monitor is malformed, resetting to 1x1." );
resize( 1, 1 ); resize( 1, 1 );
needsUpdate = true; needsUpdate = true;
} }

5
src/main/resources/data/computercraft/lua/rom/help/changelog.md
View File

@ -1,3 +1,8 @@
# New features in CC: Tweaked 1.98.1
Several bug fixes:
* Fix monitors not correctly resizing when placed.
# New features in CC: Tweaked 1.98.0 # New features in CC: Tweaked 1.98.0
* Add motd for file uploading. * Add motd for file uploading.
* Add config options to limit total bandwidth used by the HTTP API. * Add config options to limit total bandwidth used by the HTTP API.

21
src/main/resources/data/computercraft/lua/rom/help/whatsnew.md
View File

@ -1,21 +1,6 @@
New features in CC: Tweaked 1.98.0 New features in CC: Tweaked 1.98.1
* Add motd for file uploading.
* Add config options to limit total bandwidth used by the HTTP API.
And several bug fixes: Several bug fixes:
* Fix `settings.define` not accepting a nil second argument (SkyTheCodeMaster). * Fix monitors not correctly resizing when placed.
* Various documentation fixes (Angalexik, emiliskiskis, SkyTheCodeMaster).
* Fix selected slot indicator not appearing in turtle interface.
* Fix crash when printers are placed as part of world generation.
* Fix crash when breaking a speaker on a multiplayer world.
* Add a missing type check for `http.checkURL`.
* Prevent `parallel.*` from hanging when no arguments are given.
* Prevent issue in rednet when the message ID is NaN.
* Fix `help` program crashing when terminal changes width.
* Ensure monitors are well-formed when placed, preventing graphical glitches
when using Carry On or Quark.
* Accept several more extensions in the websocket client.
* Prevent `wget` crashing when given an invalid URL and no filename.
* Correctly wrap string within `textutils.slowWrite`.
Type "help changelog" to see the full version history. Type "help changelog" to see the full version history.