simon987/Much-Assembly-Required
1
0
Fork 0
mirror of https://github.com/simon987/Much-Assembly-Required.git synced 2025-04-20 02:56:44 +00:00
Code Issues Projects Releases Wiki Activity

Reverted accidental change caused by search and replace

Browse Source
This commit is contained in:
Simon 2018-05-31 22:21:33 -04:00
parent a7bdbd2513
commit a005e2b163
4 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Plugin Misc HW/src/main/java/net/simon987/mischwplugin/event/CpuInitialisationListener.java
View File

@ -24,7 +24,7 @@ public class CpuInitialisationListener implements GameEventListener {
Clock clock = new Clock(); Clock clock = new Clock();
clock.setCpu(cpu); clock.setCpu(cpu);
cubot.attachHardware(rngHW, RandomNumberGenerator.DEFAULT_ADDRESS); cpu.getHardwareHost().attachHardware(rngHW, RandomNumberGenerator.DEFAULT_ADDRESS);
cubot.attachHardware(clock, Clock.DEFAULT_ADDRESS); cpu.getHardwareHost().attachHardware(clock, Clock.DEFAULT_ADDRESS);
} }
} }

2
Plugin NPC/src/main/java/net/simon987/npcplugin/event/CpuInitialisationListener.java
View File

@ -23,6 +23,6 @@ public class CpuInitialisationListener implements GameEventListener {
RadioReceiverHardware radioHw = new RadioReceiverHardware(controllableUnit); RadioReceiverHardware radioHw = new RadioReceiverHardware(controllableUnit);
radioHw.setCpu(cpu); radioHw.setCpu(cpu);
cubot.attachHardware(radioHw, RadioReceiverHardware.DEFAULT_ADDRESS); cpu.getHardwareHost().attachHardware(radioHw, RadioReceiverHardware.DEFAULT_ADDRESS);
} }
} }

4
Server/src/main/java/net/simon987/server/assembly/instruction/HwiInstruction.java
View File

@ -23,7 +23,7 @@ public class HwiInstruction extends Instruction {
@Override @Override
public Status execute(Target src, int srcIndex, Status status) { public Status execute(Target src, int srcIndex, Status status) {
status.setErrorFlag(cubot.hardwareInterrupt(src.get(srcIndex), cpu.getStatus())); status.setErrorFlag(cpu.getHardwareHost().hardwareInterrupt(src.get(srcIndex), cpu.getStatus()));
return status; return status;
} }
@ -31,7 +31,7 @@ public class HwiInstruction extends Instruction {
@Override @Override
public Status execute(int src, Status status) { public Status execute(int src, Status status) {
status.setErrorFlag(cubot.hardwareInterrupt(src, cpu.getStatus())); status.setErrorFlag(cpu.getHardwareHost().hardwareInterrupt(src, cpu.getStatus()));
return status; return status;
} }

4
Server/src/main/java/net/simon987/server/assembly/instruction/HwqInstruction.java
View File

@ -18,14 +18,14 @@ public class HwqInstruction extends Instruction {
@Override @Override
public Status execute(Target src, int srcIndex, Status status) { public Status execute(Target src, int srcIndex, Status status) {
cubot.hardwareQuery(src.get(srcIndex)); cpu.getHardwareHost().hardwareQuery(src.get(srcIndex));
return status; return status;
} }
@Override @Override
public Status execute(int src, Status status) { public Status execute(int src, Status status) {
cubot.hardwareQuery(src); cpu.getHardwareHost().hardwareQuery(src);
return status; return status;
} }