Skip to content

Commit 6b1d75b

Browse files
author
Brendan Robert
committed
Remove lawless music selection, add additional default cards
1 parent d0a7785 commit 6b1d75b

File tree

5 files changed

+4
-18
lines changed

5 files changed

+4
-18
lines changed

.java-version

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
graalvm64-17.0.3

src/main/java/jace/JaceUIController.java

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,6 @@
2121
import jace.core.Motherboard;
2222
import jace.core.Utility;
2323
import jace.core.Video;
24-
import jace.apple2e.Apple2e;
2524
import jace.library.MediaCache;
2625
import jace.library.MediaConsumer;
2726
import jace.library.MediaConsumerParent;
@@ -40,7 +39,6 @@
4039
import javafx.scene.Node;
4140
import javafx.scene.Parent;
4241
import javafx.scene.control.Button;
43-
import javafx.scene.control.ComboBox;
4442
import javafx.scene.control.Label;
4543
import javafx.scene.control.Slider;
4644
import javafx.scene.effect.DropShadow;

src/main/java/jace/apple2e/Apple2e.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -65,13 +65,13 @@ public class Apple2e extends Computer {
6565
@ConfigurableField(name = "Slot 1", shortName = "s1card")
6666
public DeviceSelection<Cards> card1 = new DeviceSelection<>(Cards.class, null);
6767
@ConfigurableField(name = "Slot 2", shortName = "s2card")
68-
public DeviceSelection<Cards> card2 = new DeviceSelection<>(Cards.class, null);
68+
public DeviceSelection<Cards> card2 = new DeviceSelection<>(Cards.class, Cards.AppleMouse, true);
6969
@ConfigurableField(name = "Slot 3", shortName = "s3card")
7070
public DeviceSelection<Cards> card3 = new DeviceSelection<>(Cards.class, null);
7171
@ConfigurableField(name = "Slot 4", shortName = "s4card")
72-
public DeviceSelection<Cards> card4 = new DeviceSelection<>(Cards.class, null);
72+
public DeviceSelection<Cards> card4 = new DeviceSelection<>(Cards.class, Cards.Mockingboard, true);
7373
@ConfigurableField(name = "Slot 5", shortName = "s5card")
74-
public DeviceSelection<Cards> card5 = new DeviceSelection<>(Cards.class, null);
74+
public DeviceSelection<Cards> card5 = new DeviceSelection<>(Cards.class, Cards.RamFactor, true);
7575
@ConfigurableField(name = "Slot 6", shortName = "s6card")
7676
public DeviceSelection<Cards> card6 = new DeviceSelection<>(Cards.class, Cards.DiskIIDrive, true);
7777
@ConfigurableField(name = "Slot 7", shortName = "s7card")

src/main/resources/fxml/JaceUI.fxml

Lines changed: 0 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -100,19 +100,6 @@
100100
<RowConstraints minHeight="10.0" prefHeight="30.0" vgrow="SOMETIMES" />
101101
</rowConstraints>
102102
<children>
103-
<Label alignment="CENTER_RIGHT" styleClass="musicLabel" textAlignment="RIGHT">Music:</Label>
104-
<ComboBox fx:id="musicSelection" GridPane.columnIndex="1" GridPane.hgrow="ALWAYS">
105-
<items>
106-
<FXCollections fx:factory="observableArrayList">
107-
<String fx:value="8-bit Chipmusic" />
108-
<String fx:value="8-bit Orchestral samples" />
109-
<String fx:value="None" />
110-
</FXCollections>
111-
</items>
112-
<value>
113-
<String fx:value="8-bit Chipmusic" />
114-
</value>
115-
</ComboBox>
116103
<Label alignment="CENTER_RIGHT" prefHeight="53.0" prefWidth="201.0" styleClass="musicLabel" text="Speaker:" textAlignment="RIGHT" GridPane.rowIndex="1" />
117104
<Slider fx:id="speakerToggle" blockIncrement="1.0" majorTickUnit="1.0" max="1.0" maxWidth="32.0" minWidth="32.0" minorTickCount="0" prefWidth="32.0" snapToTicks="true" GridPane.columnIndex="1" GridPane.rowIndex="1" />
118105
</children>

src/main/windows/assets/icon.ico

83.2 KB
Binary file not shown.

0 commit comments

Comments
 (0)