Skip to content

Commit 4305f24

Browse files
DunkleMangoDunkleMango
committed
finally fixed a big openjfx error
+ updated build.gradle + added Loader class to fix error + can now create executable jars with gradle command: "clean build"
1 parent ebde923 commit 4305f24

18 files changed

+61
-50
lines changed

‎META-INF/MANIFEST.MF

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
Manifest-Version: 1.0
2-
Main-Class: gui.MainFrame
2+
Main-Class: MainFrame
33

‎build.gradle

+12-9
Original file line numberDiff line numberDiff line change
@@ -1,25 +1,28 @@
11
plugins {
2-
id 'java'
32
id 'application'
43
id 'org.openjfx.javafxplugin' version '0.0.7'
54
}
65

7-
group 'com.github.dunklemango'
8-
version '1.2'
9-
10-
sourceCompatibility = 1.12
11-
126
repositories {
137
mavenCentral()
148
}
159

1610
dependencies {
17-
testCompile group: 'junit', name: 'junit', version: '4.12'
11+
1812
}
1913

2014
javafx {
2115
version = "12"
22-
modules = [ 'javafx.controls', 'javafx.fxml' ]
16+
modules = [ 'javafx.controls', 'javafx.fxml']
2317
}
2418

25-
mainClassName = 'gui.MainFrame'
19+
mainClassName = 'com.github.dunklemango.starboundmodmanager.MainFrame'
20+
21+
jar {
22+
manifest {
23+
attributes 'Main-Class': 'com.github.dunklemango.starboundmodmanager.Launcher'
24+
}
25+
from {
26+
configurations.runtimeClasspath.collect { it.isDirectory() ? it : zipTree(it) }
27+
}
28+
}

‎build/scripts/StarboundModManager

+2-2
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@ case "`uname`" in
6464
;;
6565
esac
6666

67-
CLASSPATH=$APP_HOME/lib/StarboundModManager-1.2.jar:$APP_HOME/lib/javafx-fxml-12-win.jar:$APP_HOME/lib/javafx-controls-12-win.jar:$APP_HOME/lib/javafx-controls-12.jar:$APP_HOME/lib/javafx-graphics-12-win.jar:$APP_HOME/lib/javafx-graphics-12.jar:$APP_HOME/lib/javafx-base-12-win.jar:$APP_HOME/lib/javafx-base-12.jar
67+
CLASSPATH=$APP_HOME/lib/StarboundModManager.jar:$APP_HOME/lib/javafx-fxml-12-win.jar:$APP_HOME/lib/javafx-controls-12-win.jar:$APP_HOME/lib/javafx-controls-12.jar:$APP_HOME/lib/javafx-graphics-12-win.jar:$APP_HOME/lib/javafx-graphics-12.jar:$APP_HOME/lib/javafx-base-12-win.jar:$APP_HOME/lib/javafx-base-12.jar
6868

6969
# Determine the Java command to use to start the JVM.
7070
if [ -n "$JAVA_HOME" ] ; then
@@ -162,7 +162,7 @@ save () {
162162
APP_ARGS=$(save "$@")
163163

164164
# Collect all arguments for the java command, following the shell quoting and substitution rules
165-
eval set -- $DEFAULT_JVM_OPTS $JAVA_OPTS $STARBOUND_MOD_MANAGER_OPTS -classpath "\"$CLASSPATH\"" gui.MainFrame "$APP_ARGS"
165+
eval set -- $DEFAULT_JVM_OPTS $JAVA_OPTS $STARBOUND_MOD_MANAGER_OPTS -classpath "\"$CLASSPATH\"" com.github.dunklemango.starboundmodmanager.MainFrame "$APP_ARGS"
166166

167167
# by default we should be in the correct project dir, but when run from Finder on Mac, the cwd is wrong
168168
if [ "$(uname)" = "Darwin" ] && [ "$HOME" = "$PWD" ]; then

‎build/scripts/StarboundModManager.bat

+2-2
Original file line numberDiff line numberDiff line change
@@ -63,10 +63,10 @@ set CMD_LINE_ARGS=%*
6363
:execute
6464
@rem Setup the command line
6565

66-
set CLASSPATH=%APP_HOME%\lib\StarboundModManager-1.2.jar;%APP_HOME%\lib\javafx-fxml-12-win.jar;%APP_HOME%\lib\javafx-controls-12-win.jar;%APP_HOME%\lib\javafx-controls-12.jar;%APP_HOME%\lib\javafx-graphics-12-win.jar;%APP_HOME%\lib\javafx-graphics-12.jar;%APP_HOME%\lib\javafx-base-12-win.jar;%APP_HOME%\lib\javafx-base-12.jar
66+
set CLASSPATH=%APP_HOME%\lib\StarboundModManager.jar;%APP_HOME%\lib\javafx-fxml-12-win.jar;%APP_HOME%\lib\javafx-controls-12-win.jar;%APP_HOME%\lib\javafx-controls-12.jar;%APP_HOME%\lib\javafx-graphics-12-win.jar;%APP_HOME%\lib\javafx-graphics-12.jar;%APP_HOME%\lib\javafx-base-12-win.jar;%APP_HOME%\lib\javafx-base-12.jar
6767

6868
@rem Execute StarboundModManager
69-
"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %STARBOUND_MOD_MANAGER_OPTS% -classpath "%CLASSPATH%" gui.MainFrame %CMD_LINE_ARGS%
69+
"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %STARBOUND_MOD_MANAGER_OPTS% -classpath "%CLASSPATH%" com.github.dunklemango.starboundmodmanager.MainFrame %CMD_LINE_ARGS%
7070

7171
:end
7272
@rem End local scope for the variables with windows NT shell

‎build/tmp/jar/MANIFEST.MF

+1
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,3 @@
11
Manifest-Version: 1.0
2+
Main-Class: com.github.dunklemango.starboundmodmanager.Launcher
23

‎src/main/java/com/github/dunklemango/starboundmodmanager/Launcher.java

+7
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
package com.github.dunklemango.starboundmodmanager;
2+
3+
public class Launcher {
4+
public static void main(String[] args) {
5+
MainFrame.main(args);
6+
}
7+
}

‎src/main/java/gui/MainFrame.java ‎src/main/java/com/github/dunklemango/starboundmodmanager/MainFrame.java

+17-17
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,13 @@
1-
package gui;
2-
3-
import data.ModFile;
4-
import exceptions.ModFileGenerationException;
5-
import exceptions.ModFileNotFoundException;
6-
import gui.cells.CheckBoxCell;
7-
import gui.cells.RepresentingType;
1+
package com.github.dunklemango.starboundmodmanager;
2+
3+
import com.github.dunklemango.starboundmodmanager.data.ModFile;
4+
import com.github.dunklemango.starboundmodmanager.exceptions.ModFileGenerationException;
5+
import com.github.dunklemango.starboundmodmanager.exceptions.ModFileNotFoundException;
6+
import com.github.dunklemango.starboundmodmanager.gui.cells.CheckBoxCell;
7+
import com.github.dunklemango.starboundmodmanager.gui.cells.RepresentingType;
8+
import com.github.dunklemango.starboundmodmanager.managers.checkboxes.InputCheckBoxManager;
9+
import com.github.dunklemango.starboundmodmanager.managers.checkboxes.OutputCheckBoxManager;
10+
import com.github.dunklemango.starboundmodmanager.managers.settings.SettingsManager;
811
import javafx.application.Application;
912
import javafx.collections.FXCollections;
1013
import javafx.collections.ObservableList;
@@ -21,10 +24,7 @@
2124
import javafx.stage.DirectoryChooser;
2225
import javafx.stage.Modality;
2326
import javafx.stage.Stage;
24-
import managers.checkboxes.InputCheckBoxManager;
25-
import managers.checkboxes.OutputCheckBoxManager;
26-
import managers.settings.SettingsManager;
27-
import transfer.FileTransferTask;
27+
import com.github.dunklemango.starboundmodmanager.transfer.FileTransferTask;
2828

2929
import java.io.File;
3030
import java.util.ArrayList;
@@ -86,8 +86,8 @@ public void start(Stage primaryStage) {
8686

8787
private void setupUpdateButton(GridPane grid, Stage primaryStage) {
8888
Alert transferAlert = new Alert(Alert.AlertType.CONFIRMATION);
89-
transferAlert.setTitle("Confirmation of transfer");
90-
transferAlert.setHeaderText("Do you wish to transfer the following files?");
89+
transferAlert.setTitle("Confirmation of com.github.dunklemango.transfer");
90+
transferAlert.setHeaderText("Do you wish to com.github.dunklemango.transfer the following files?");
9191

9292
Button updateButton = new Button("Update all");
9393
updateButton.setMinWidth(buttonVBox.getPrefWidth());
@@ -121,8 +121,8 @@ private void setupUpdateButton(GridPane grid, Stage primaryStage) {
121121

122122
private void setupTransferButton(GridPane grid, Stage primaryStage) {
123123
Alert transferAlert = new Alert(Alert.AlertType.CONFIRMATION);
124-
transferAlert.setTitle("Confirmation of transfer");
125-
transferAlert.setHeaderText("Do you wish to transfer the following files?");
124+
transferAlert.setTitle("Confirmation of com.github.dunklemango.transfer");
125+
transferAlert.setHeaderText("Do you wish to com.github.dunklemango.transfer the following files?");
126126

127127
Button transferButton = new Button("Transfer Selected");
128128
transferButton.setMinWidth(buttonVBox.getPrefWidth());
@@ -151,7 +151,7 @@ private void transferFiles(ArrayList<String> dirsOfFilesToTransfer, Stage primar
151151
final Stage dialog = new Stage();
152152
dialog.initModality(Modality.APPLICATION_MODAL);
153153
dialog.initOwner(primaryStage);
154-
dialog.setTitle("File-transfer");
154+
dialog.setTitle("File-com.github.dunklemango.transfer");
155155

156156
GridPane grid = new GridPane();
157157
grid.setAlignment(Pos.CENTER);
@@ -161,7 +161,7 @@ private void transferFiles(ArrayList<String> dirsOfFilesToTransfer, Stage primar
161161
ProgressBar progressBar = new ProgressBar();
162162
progressBar.setPrefWidth(300);
163163

164-
grid.add(new Text("Progress of transfer:"), 0, 0);
164+
grid.add(new Text("Progress of com.github.dunklemango.transfer:"), 0, 0);
165165

166166
List<File> inputFiles = new ArrayList<>();
167167
List<File> outputFiles = new ArrayList<>();

‎src/main/java/data/ModFile.java ‎src/main/java/com/github/dunklemango/starboundmodmanager/data/ModFile.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
package data;
1+
package com.github.dunklemango.starboundmodmanager.data;
22

3-
import exceptions.ModFileGenerationException;
3+
import com.github.dunklemango.starboundmodmanager.exceptions.ModFileGenerationException;
44

55
import java.io.File;
66
import java.util.Date;

‎src/main/java/exceptions/ModFileGenerationException.java ‎src/main/java/com/github/dunklemango/starboundmodmanager/exceptions/ModFileGenerationException.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package exceptions;
1+
package com.github.dunklemango.starboundmodmanager.exceptions;
22

33
public class ModFileGenerationException extends Exception{
44

‎src/main/java/exceptions/ModFileNotFoundException.java ‎src/main/java/com/github/dunklemango/starboundmodmanager/exceptions/ModFileNotFoundException.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package exceptions;
1+
package com.github.dunklemango.starboundmodmanager.exceptions;
22

33
public class ModFileNotFoundException extends Exception {
44

‎src/main/java/gui/cells/CheckBoxCell.java ‎src/main/java/com/github/dunklemango/starboundmodmanager/gui/cells/CheckBoxCell.java

+4-4
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
1-
package gui.cells;
1+
package com.github.dunklemango.starboundmodmanager.gui.cells;
22

3+
import com.github.dunklemango.starboundmodmanager.managers.checkboxes.CheckBoxManager;
4+
import com.github.dunklemango.starboundmodmanager.managers.checkboxes.InputCheckBoxManager;
5+
import com.github.dunklemango.starboundmodmanager.managers.checkboxes.OutputCheckBoxManager;
36
import javafx.scene.control.CheckBox;
47
import javafx.scene.control.Label;
58
import javafx.scene.control.ListCell;
69
import javafx.scene.layout.HBox;
710
import javafx.scene.layout.Pane;
811
import javafx.scene.layout.Priority;
9-
import managers.checkboxes.CheckBoxManager;
10-
import managers.checkboxes.InputCheckBoxManager;
11-
import managers.checkboxes.OutputCheckBoxManager;
1212

1313
public class CheckBoxCell extends ListCell<String> {
1414

‎src/main/java/com/github/dunklemango/starboundmodmanager/gui/cells/RepresentingType.java

+6
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
package com.github.dunklemango.starboundmodmanager.gui.cells;
2+
3+
public enum RepresentingType {
4+
INPUT,
5+
OUTPUT;
6+
}

‎src/main/java/managers/checkboxes/CheckBoxManager.java ‎src/main/java/com/github/dunklemango/starboundmodmanager/managers/checkboxes/CheckBoxManager.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package managers.checkboxes;
1+
package com.github.dunklemango.starboundmodmanager.managers.checkboxes;
22

33
import javafx.collections.FXCollections;
44
import javafx.collections.ObservableMap;

‎src/main/java/managers/checkboxes/InputCheckBoxManager.java ‎src/main/java/com/github/dunklemango/starboundmodmanager/managers/checkboxes/InputCheckBoxManager.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package managers.checkboxes;
1+
package com.github.dunklemango.starboundmodmanager.managers.checkboxes;
22

33
public final class InputCheckBoxManager extends CheckBoxManager {
44

‎src/main/java/managers/checkboxes/OutputCheckBoxManager.java ‎src/main/java/com/github/dunklemango/starboundmodmanager/managers/checkboxes/OutputCheckBoxManager.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package managers.checkboxes;
1+
package com.github.dunklemango.starboundmodmanager.managers.checkboxes;
22

33
public final class OutputCheckBoxManager extends CheckBoxManager {
44

‎src/main/java/managers/settings/SettingsManager.java ‎src/main/java/com/github/dunklemango/starboundmodmanager/managers/settings/SettingsManager.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package managers.settings;
1+
package com.github.dunklemango.starboundmodmanager.managers.settings;
22

33
import java.io.File;
44
import java.io.FileInputStream;

‎src/main/java/transfer/FileTransferTask.java ‎src/main/java/com/github/dunklemango/starboundmodmanager/transfer/FileTransferTask.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package transfer;
1+
package com.github.dunklemango.starboundmodmanager.transfer;
22

33
import javafx.concurrent.Task;
44
import javafx.scene.control.ProgressBar;

‎src/main/java/gui/cells/RepresentingType.java

-6
This file was deleted.

0 commit comments

Comments
 (0)