From a005e2b163f64483bc5aa1bc67bedae7e3681288 Mon Sep 17 00:00:00 2001 From: Simon Date: Thu, 31 May 2018 22:21:33 -0400 Subject: [PATCH] Reverted accidental change caused by search and replace --- .../mischwplugin/event/CpuInitialisationListener.java | 4 ++-- .../simon987/npcplugin/event/CpuInitialisationListener.java | 2 +- .../simon987/server/assembly/instruction/HwiInstruction.java | 4 ++-- .../simon987/server/assembly/instruction/HwqInstruction.java | 4 ++-- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/Plugin Misc HW/src/main/java/net/simon987/mischwplugin/event/CpuInitialisationListener.java b/Plugin Misc HW/src/main/java/net/simon987/mischwplugin/event/CpuInitialisationListener.java index 5563ba0..04ee15a 100644 --- a/Plugin Misc HW/src/main/java/net/simon987/mischwplugin/event/CpuInitialisationListener.java +++ b/Plugin Misc HW/src/main/java/net/simon987/mischwplugin/event/CpuInitialisationListener.java @@ -24,7 +24,7 @@ public class CpuInitialisationListener implements GameEventListener { Clock clock = new Clock(); clock.setCpu(cpu); - cubot.attachHardware(rngHW, RandomNumberGenerator.DEFAULT_ADDRESS); - cubot.attachHardware(clock, Clock.DEFAULT_ADDRESS); + cpu.getHardwareHost().attachHardware(rngHW, RandomNumberGenerator.DEFAULT_ADDRESS); + cpu.getHardwareHost().attachHardware(clock, Clock.DEFAULT_ADDRESS); } } \ No newline at end of file diff --git a/Plugin NPC/src/main/java/net/simon987/npcplugin/event/CpuInitialisationListener.java b/Plugin NPC/src/main/java/net/simon987/npcplugin/event/CpuInitialisationListener.java index fbbd422..ea916e7 100644 --- a/Plugin NPC/src/main/java/net/simon987/npcplugin/event/CpuInitialisationListener.java +++ b/Plugin NPC/src/main/java/net/simon987/npcplugin/event/CpuInitialisationListener.java @@ -23,6 +23,6 @@ public class CpuInitialisationListener implements GameEventListener { RadioReceiverHardware radioHw = new RadioReceiverHardware(controllableUnit); radioHw.setCpu(cpu); - cubot.attachHardware(radioHw, RadioReceiverHardware.DEFAULT_ADDRESS); + cpu.getHardwareHost().attachHardware(radioHw, RadioReceiverHardware.DEFAULT_ADDRESS); } } diff --git a/Server/src/main/java/net/simon987/server/assembly/instruction/HwiInstruction.java b/Server/src/main/java/net/simon987/server/assembly/instruction/HwiInstruction.java index b65a4c2..555ea33 100755 --- a/Server/src/main/java/net/simon987/server/assembly/instruction/HwiInstruction.java +++ b/Server/src/main/java/net/simon987/server/assembly/instruction/HwiInstruction.java @@ -23,7 +23,7 @@ public class HwiInstruction extends Instruction { @Override 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; } @@ -31,7 +31,7 @@ public class HwiInstruction extends Instruction { @Override public Status execute(int src, Status status) { - status.setErrorFlag(cubot.hardwareInterrupt(src, cpu.getStatus())); + status.setErrorFlag(cpu.getHardwareHost().hardwareInterrupt(src, cpu.getStatus())); return status; } diff --git a/Server/src/main/java/net/simon987/server/assembly/instruction/HwqInstruction.java b/Server/src/main/java/net/simon987/server/assembly/instruction/HwqInstruction.java index 6759cc3..667e771 100644 --- a/Server/src/main/java/net/simon987/server/assembly/instruction/HwqInstruction.java +++ b/Server/src/main/java/net/simon987/server/assembly/instruction/HwqInstruction.java @@ -18,14 +18,14 @@ public class HwqInstruction extends Instruction { @Override public Status execute(Target src, int srcIndex, Status status) { - cubot.hardwareQuery(src.get(srcIndex)); + cpu.getHardwareHost().hardwareQuery(src.get(srcIndex)); return status; } @Override public Status execute(int src, Status status) { - cubot.hardwareQuery(src); + cpu.getHardwareHost().hardwareQuery(src); return status; }