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

Allow returning collections and arrays from Java

Browse Source 
Closes #344
This commit is contained in:
SquidDev
2020-01-13 13:20:15 +00:00
parent 35c1b10224
commit 4c8fd4fc35
6 changed files with 67 additions and 101 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
src/main/java/dan200/computercraft/core/apis/FSAPI.java
View File

@@ -22,8 +22,6 @@ import java.io.BufferedReader;
import java.io.BufferedWriter;
import java.nio.channels.ReadableByteChannel;
import java.nio.channels.WritableByteChannel;
import java.util.HashMap;
import java.util.Map;
import java.util.function.Function;
import static dan200.computercraft.api.lua.ArgumentHelper.getString;
@@ -93,13 +91,7 @@ public class FSAPI implements ILuaAPI
m_env.addTrackingChange( TrackingField.FS_OPS );
try
{
String[] results = m_fileSystem.list( path );
Map<Object, Object> table = new HashMap<>();
for( int i = 0; i < results.length; i++ )
{
table.put( i + 1, results[i] );
}
return new Object[] { table };
return new Object[] { m_fileSystem.list( path ) };
}
catch( FileSystemException e )
{
@@ -330,13 +322,7 @@ public class FSAPI implements ILuaAPI
try
{
m_env.addTrackingChange( TrackingField.FS_OPS );
String[] results = m_fileSystem.find( path );
Map<Object, Object> table = new HashMap<>();
for( int i = 0; i < results.length; i++ )
{
table.put( i + 1, results[i] );
}
return new Object[] { table };
return new Object[] { m_fileSystem.find( path ) };
}
catch( FileSystemException e )
{