diff --git a/.java-version b/.java-version new file mode 100644 index 0000000..c7464da --- /dev/null +++ b/.java-version @@ -0,0 +1 @@ +graalvm64-17.0.3 diff --git a/src/main/java/jace/JaceUIController.java b/src/main/java/jace/JaceUIController.java index 05781a2..4e75344 100644 --- a/src/main/java/jace/JaceUIController.java +++ b/src/main/java/jace/JaceUIController.java @@ -21,7 +21,6 @@ import jace.core.Card; import jace.core.Motherboard; import jace.core.Utility; import jace.core.Video; -import jace.apple2e.Apple2e; import jace.library.MediaCache; import jace.library.MediaConsumer; import jace.library.MediaConsumerParent; @@ -40,7 +39,6 @@ import javafx.geometry.Insets; import javafx.scene.Node; import javafx.scene.Parent; import javafx.scene.control.Button; -import javafx.scene.control.ComboBox; import javafx.scene.control.Label; import javafx.scene.control.Slider; import javafx.scene.effect.DropShadow; diff --git a/src/main/java/jace/apple2e/Apple2e.java b/src/main/java/jace/apple2e/Apple2e.java index 218c3da..a00ecab 100644 --- a/src/main/java/jace/apple2e/Apple2e.java +++ b/src/main/java/jace/apple2e/Apple2e.java @@ -65,13 +65,13 @@ public class Apple2e extends Computer { @ConfigurableField(name = "Slot 1", shortName = "s1card") public DeviceSelection card1 = new DeviceSelection<>(Cards.class, null); @ConfigurableField(name = "Slot 2", shortName = "s2card") - public DeviceSelection card2 = new DeviceSelection<>(Cards.class, null); + public DeviceSelection card2 = new DeviceSelection<>(Cards.class, Cards.AppleMouse, true); @ConfigurableField(name = "Slot 3", shortName = "s3card") public DeviceSelection card3 = new DeviceSelection<>(Cards.class, null); @ConfigurableField(name = "Slot 4", shortName = "s4card") - public DeviceSelection card4 = new DeviceSelection<>(Cards.class, null); + public DeviceSelection card4 = new DeviceSelection<>(Cards.class, Cards.Mockingboard, true); @ConfigurableField(name = "Slot 5", shortName = "s5card") - public DeviceSelection card5 = new DeviceSelection<>(Cards.class, null); + public DeviceSelection card5 = new DeviceSelection<>(Cards.class, Cards.RamFactor, true); @ConfigurableField(name = "Slot 6", shortName = "s6card") public DeviceSelection card6 = new DeviceSelection<>(Cards.class, Cards.DiskIIDrive, true); @ConfigurableField(name = "Slot 7", shortName = "s7card") diff --git a/src/main/resources/fxml/JaceUI.fxml b/src/main/resources/fxml/JaceUI.fxml index a1d631b..6a77ccf 100644 --- a/src/main/resources/fxml/JaceUI.fxml +++ b/src/main/resources/fxml/JaceUI.fxml @@ -100,19 +100,6 @@ - - - - - - - - - - - - - diff --git a/src/main/windows/assets/icon.ico b/src/main/windows/assets/icon.ico new file mode 100644 index 0000000..3e010b9 Binary files /dev/null and b/src/main/windows/assets/icon.ico differ