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

Merge branch 'master' into mc-1.14.x

Browse Source
This commit is contained in:
SquidDev 2020-01-14 08:52:59 +00:00
commit bf6d017ad1
4 changed files with 10 additions and 17 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_version=1.86.1
mod_version=1.86.2
# Minecraft properties (update mods.toml when changing)
mc_version=1.14.4

9
src/main/java/dan200/computercraft/core/apis/PeripheralAPI.java
View File

@ -364,20 +364,17 @@ public class PeripheralAPI implements ILuaAPI, IAPIEnvironment.IPeripheralChange
case 2:
{
// getMethods
String[] methods = null;
ComputerSide side = ComputerSide.valueOfInsensitive( getString( args, 0 ) );
if( side != null )
{
synchronized( m_peripherals )
{
PeripheralWrapper p = m_peripherals[side.ordinal()];
if( p != null )
{
methods = p.getMethods();
}
if( p != null ) return new Object[] { p.getMethods() };
}
}
return methods != null ? new Object[] { new HashMap<>() } : null;
return null;
}
case 3:
{

4
src/main/resources/data/computercraft/lua/rom/help/changelog.txt
View File

@ -1,3 +1,7 @@
# New features in CC: Tweaked 1.86.2
* Fix peripheral.getMethods returning an empty table
# New features in CC: Tweaked 1.86.1
* Add a help message to the Lua REPL's exit function

12
src/main/resources/data/computercraft/lua/rom/help/whatsnew.txt
View File

@ -1,13 +1,5 @@
New features in CC: Tweaked 1.86.1
New features in CC: Tweaked 1.86.2
* Add a help message to the Lua REPL's exit function
* Add more MOTD messages. (osmarks)
* GPS requests are now made anonymously (osmarks)
* Minor memory usage improvements to Cobalt VM.
And several bug fixes:
* Fix error when calling `write` with a number.
* Add missing assertion to `io.write`.
* Fix incorrect coordinates in `mouse_scroll` events.
* Fix peripheral.getMethods returning an empty table
Type "help changelog" to see the full version history.