niklas/cc-haxe
1
0
Fork 0
Code Issues 14 Pull Requests Projects Releases Wiki Activity

made peripherals a static class

Browse Source
This commit is contained in:
Djeeberjr
2023-07-27 20:38:23 +02:00
parent a93ee1cddf
commit 9deea0ee98
14 changed files with 42 additions and 52 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/bin/Disk.hx
View File

@@ -9,7 +9,7 @@ using Lambda;
class Disk extends CLIAppBase {
public function new() {
registerSyncSubcommand("ls", (args)->{
Peripheral.instance.getAllDrives().foreach(drive -> {
Peripheral.getAllDrives().foreach(drive -> {
var addr = drive.getAddr();
var label = drive.getDiskLabel();
var id = drive.getDiskID();
@@ -53,7 +53,7 @@ class Disk extends CLIAppBase {
}
var driveAddr = args[0];
var drive = Peripheral.instance.getDrive(driveAddr);
var drive = Peripheral.getDrive(driveAddr);
if (drive == null){
handle.writeLine("Drive not found: " + driveAddr);
@@ -76,7 +76,7 @@ class Disk extends CLIAppBase {
}
var driveAddr = args[0];
var drive = Peripheral.instance.getDrive(driveAddr);
var drive = Peripheral.getDrive(driveAddr);
var label:String = args[1];
if (drive == null){
@@ -102,7 +102,7 @@ class Disk extends CLIAppBase {
}
private function audioDiskPlayPause(driveAddr: String, play: Bool): Bool {
var drive = Peripheral.instance.getDrive(driveAddr);
var drive = Peripheral.getDrive(driveAddr);
if (drive == null){
handle.writeLine("Drive not found: " + driveAddr);

2
src/bin/Net.hx
View File

@@ -19,7 +19,7 @@ class Net extends CLIAppBase {
});
registerSyncSubcommand("iface", (args)->{
var modems = Peripheral.instance.getAllModems();
var modems = Peripheral.getAllModems();
for (modem in modems) {
handle.writeLine(modem.name());

6
src/bin/Perf.hx
View File

@@ -8,7 +8,7 @@ class Perf extends CLIAppBase {
registerSyncSubcommand("inspect",(args)->{
if (args.length < 1) return false;
var result = Peripheral.instance.inspect(args[0]);
var result = Peripheral.inspect(args[0]);
if (result == null){
handle.writeLine("No peripheral found on side "+args[0]);
@@ -29,8 +29,8 @@ class Perf extends CLIAppBase {
},"<side>");
registerSyncSubcommand("list",(args)->{
for (addr in Peripheral.instance.getAllAddresses()){
handle.writeLine('$addr => ${Peripheral.instance.getTypes(addr).join(", ")}');
for (addr in Peripheral.getAllAddresses()){
handle.writeLine('$addr => ${Peripheral.getTypes(addr).join(", ")}');
}
return true;
});

6
src/bin/Redstone.hx
View File

@@ -8,17 +8,17 @@ using tink.CoreApi;
class Redstone extends CLIAppBase{
public function new() {
registerSyncSubcommand("on", (args)-> {
Peripheral.instance.getRedstone(args[0]).setOutput(true);
Peripheral.getRedstone(args[0]).setOutput(true);
return true;
},"<side>");
registerSyncSubcommand("off", (args)-> {
Peripheral.instance.getRedstone(args[0]).setOutput(false);
Peripheral.getRedstone(args[0]).setOutput(false);
return true;
},"<side>");
registerSyncSubcommand("get", (args)-> {
var value = Peripheral.instance.getRedstone(args[0]).getAnalogInput();
var value = Peripheral.getRedstone(args[0]).getAnalogInput();
handle.write("Analog input: " + value);
return true;
},"<side>");

2
src/bin/exporter/Res.hx
View File

@@ -35,7 +35,7 @@ class Res extends CLIAppBase {
return false;
}
var perf: kernel.peripherals.Redstone = Peripheral.instance.getRedstone(addr);
var perf: kernel.peripherals.Redstone = Peripheral.getRedstone(addr);
if (perf == null) {
handle.writeLine("Error: peripheral not found");

2
src/bin/exporter/ResManager.hx
View File

@@ -73,7 +73,7 @@ class ResManager implements Process {
var savedExports: Array<{name: String, addr: String, type: String}> = store.get("exports",[]);
for (export in savedExports){
var perph = Peripheral.instance.getFromType(export.addr,export.type);
var perph = Peripheral.getFromType(export.addr,export.type);
if (perph == null){
handle.writeLine('Could not load export: ${export.name} on ${export.addr}');