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

Merge pull request #167 from SquidDev-CC/hotfix/limit-label 

Impose additional limitations on disk and computer labels
This commit is contained in:
Daniel Ratcliffe 2017-05-02 13:54:43 +01:00 committed by GitHub
parent 3a360a50b0 14d3a182d9
commit 4825aefccf
3 changed files with 30 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 );

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

@ -0,0 +1,26 @@
package dan200.computercraft.shared.util;
public class StringUtil
{
public static String normaliseLabel( String label )
{
if( label == null ) return null;
int length = Math.min( 32, label.length() );
StringBuilder builder = new StringBuilder( length );
for (int i = 0; i < length; i++)
{
char c = label.charAt( i );
if( (c >= ' ' && c <= '~') || (c >= 161 && c <= 172) || (c >= 174 && c <= 255) )
{
builder.append( c );
}
else
{
builder.append( '?' );
}
}
return builder.toString();
}
}