From 1dded657c67e7add0e78899fb5867301ece6edde Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Florian=20N=C3=BCcke?= <florian@nuecke.de>
Date: Sat, 26 Sep 2020 21:27:25 +0200
Subject: [PATCH] Stripped out the `vm` package because it feels very redundant
 now.

---
 .../li/cil/oc2/client/gui/KeyCodeMapping.java  |  2 +-
 .../li/cil/oc2/client/gui/RISCVTestScreen.java | 18 +++++++++---------
 .../oc2/common/vm/VirtualMachineRunner.java    |  2 +-
 3 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/src/main/java/li/cil/oc2/client/gui/KeyCodeMapping.java b/src/main/java/li/cil/oc2/client/gui/KeyCodeMapping.java
index bf837f35..6f0f1349 100644
--- a/src/main/java/li/cil/oc2/client/gui/KeyCodeMapping.java
+++ b/src/main/java/li/cil/oc2/client/gui/KeyCodeMapping.java
@@ -1,7 +1,7 @@
 package li.cil.oc2.client.gui;
 
 import it.unimi.dsi.fastutil.ints.Int2IntArrayMap;
-import li.cil.sedna.vm.evdev.EvdevKeys;
+import li.cil.sedna.evdev.EvdevKeys;
 import org.lwjgl.glfw.GLFW;
 
 public final class KeyCodeMapping {
diff --git a/src/main/java/li/cil/oc2/client/gui/RISCVTestScreen.java b/src/main/java/li/cil/oc2/client/gui/RISCVTestScreen.java
index 7212fbbc..d6eddc9e 100644
--- a/src/main/java/li/cil/oc2/client/gui/RISCVTestScreen.java
+++ b/src/main/java/li/cil/oc2/client/gui/RISCVTestScreen.java
@@ -5,15 +5,15 @@ import it.unimi.dsi.fastutil.bytes.ByteArrayFIFOQueue;
 import li.cil.oc2.client.gui.terminal.Terminal;
 import li.cil.oc2.client.gui.terminal.TerminalInput;
 import li.cil.oc2.common.vm.VirtualMachineRunner;
-import li.cil.sedna.api.vm.device.memory.PhysicalMemory;
-import li.cil.sedna.api.vm.device.memory.Sizes;
-import li.cil.sedna.vm.device.ByteBufferBlockDevice;
-import li.cil.sedna.vm.device.UART16550A;
-import li.cil.sedna.vm.device.memory.Memory;
-import li.cil.sedna.vm.device.virtio.VirtIOBlockDevice;
-import li.cil.sedna.vm.device.virtio.VirtIOConsoleDevice;
-import li.cil.sedna.vm.device.virtio.VirtIOKeyboardDevice;
-import li.cil.sedna.vm.riscv.R5Board;
+import li.cil.sedna.api.device.PhysicalMemory;
+import li.cil.sedna.api.Sizes;
+import li.cil.sedna.device.block.ByteBufferBlockDevice;
+import li.cil.sedna.device.serial.UART16550A;
+import li.cil.sedna.device.memory.Memory;
+import li.cil.sedna.device.virtio.VirtIOBlockDevice;
+import li.cil.sedna.device.virtio.VirtIOConsoleDevice;
+import li.cil.sedna.device.virtio.VirtIOKeyboardDevice;
+import li.cil.sedna.riscv.R5Board;
 import net.minecraft.client.gui.screen.Screen;
 import net.minecraft.util.text.StringTextComponent;
 import org.apache.logging.log4j.LogManager;
diff --git a/src/main/java/li/cil/oc2/common/vm/VirtualMachineRunner.java b/src/main/java/li/cil/oc2/common/vm/VirtualMachineRunner.java
index 30db9714..21279e72 100644
--- a/src/main/java/li/cil/oc2/common/vm/VirtualMachineRunner.java
+++ b/src/main/java/li/cil/oc2/common/vm/VirtualMachineRunner.java
@@ -1,6 +1,6 @@
 package li.cil.oc2.common.vm;
 
-import li.cil.sedna.vm.riscv.R5Board;
+import li.cil.sedna.riscv.R5Board;
 
 import java.util.concurrent.ExecutionException;
 import java.util.concurrent.ExecutorService;