mirrors/CC-Tweaked
1
0
Fork 0
mirror of https://github.com/SquidDev-CC/CC-Tweaked synced 2025-11-11 02:43:14 +00:00
Code Issues Releases Wiki Activity

Merge pull request #364 from KingofGamesYami/feature/computer-get-label

Browse Source 
Add .getLabel
This commit is contained in:
Daniel Ratcliffe
2017-07-25 20:06:22 +01:00
committed by GitHub
parent ff2c26c4a1 f1bb56557d
commit 6701403370
3 changed files with 6 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/main/java/dan200/computercraft/shared/computer/blocks/ComputerPeripheral.java
View File

@@ -45,6 +45,7 @@ public class ComputerPeripheral
"reboot", "reboot",
"getID", "getID",
"isOn", "isOn",
"getLabel",
}; };
} }
@@ -83,6 +84,9 @@ public class ComputerPeripheral
// isOn // isOn
return new Object[] { m_computer.isOn() }; return new Object[] { m_computer.isOn() };
} }
case 5:
// getLabel
return new Object[] { m_computer.getLabel() };
default: default:
{ {
return null; return null;

1
src/main/resources/assets/computercraft/lua/rom/help/changelog.txt
View File

@@ -32,6 +32,7 @@ New Features in ComputerCraft 1.80:
* Fixed a handful of bugs in ComputerCraft * Fixed a handful of bugs in ComputerCraft
* Added speaker block, turtle upgrade, pocket upgrade, and peripheral api * Added speaker block, turtle upgrade, pocket upgrade, and peripheral api
* Startup can now be a directory containing multiple startup files * Startup can now be a directory containing multiple startup files
* Added .getLabel to the computer peripheral
New Features in ComputerCraft 1.79: New Features in ComputerCraft 1.79:

1
src/main/resources/assets/computercraft/lua/rom/help/whatsnew.txt
View File

@@ -32,5 +32,6 @@ New Features in ComputerCraft 1.80:
* Fixed a handful of bugs in ComputerCraft * Fixed a handful of bugs in ComputerCraft
* Added speaker block, turtle upgrade, pocket upgrade, and peripheral api * Added speaker block, turtle upgrade, pocket upgrade, and peripheral api
* Startup can now be a directory containing multiple startup files * Startup can now be a directory containing multiple startup files
* Added .getLabel to the computer peripheral
Type "help changelog" to see the full version history. Type "help changelog" to see the full version history.