mirrors
/
CC-Tweaked
mirror of https://github.com/SquidDev-CC/CC-Tweaked
1
0
Fork 0
Code Issues Releases Wiki Activity

Impose additional limitations on disk and computer labels 

Closes #147
This commit is contained in:
SquidDev 2017-05-01 22:23:54 +01:00
parent 1b562ae837
commit b1efbdad95
3 changed files with 24 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/main/java/dan200/computercraft/core/apis/OSAPI.java
View File

@ -8,6 +8,7 @@
import dan200.computercraft.api.lua.ILuaContext;
import dan200.computercraft.api.lua.LuaException;
import dan200.computercraft.shared.util.StringUtil;
import java.util.Arrays;
import java.util.HashMap;
@ -266,11 +267,7 @@ public Object[] callMethod( ILuaContext context, int method, Object[] args ) thr
{
throw new LuaException( "Expected string or nil" );
}
label = (String)args[0];
if( label.length() > 32 )
{
label = label.substring( 0, 32 );
}
label = StringUtil.normaliseLabel( (String) args[0] );
}
m_apiEnvironment.setLabel( label );
return null;

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

@ -12,6 +12,7 @@
import dan200.computercraft.api.peripheral.IComputerAccess;
import dan200.computercraft.api.peripheral.IPeripheral;
import dan200.computercraft.shared.media.items.ItemDiskLegacy;
import dan200.computercraft.shared.util.StringUtil;
import net.minecraft.item.Item;
import net.minecraft.item.ItemStack;
@ -87,6 +88,7 @@ public Object[] callMethod( IComputerAccess computer, ILuaContext context, int m
if( media != null )
{
ItemStack disk = m_diskDrive.getDiskStack();
label = StringUtil.normaliseLabel( label );
if( media.setLabel( disk, label ) )
{
m_diskDrive.setDiskStack( disk );

20
src/main/java/dan200/computercraft/shared/util/StringUtil.java Normal file
View File

@ -0,0 +1,20 @@
package dan200.computercraft.shared.util;
import java.util.regex.Pattern;
public class StringUtil
{
private static final Pattern INVALID_PATTERN = Pattern.compile( "[^ -~]" );
public static String normaliseLabel( String label )
{
label = INVALID_PATTERN.matcher( label ).replaceAll( "" );
if( label.length() > 32 )
{
label = label.substring( 0, 32 );
}
return label;
}
}