GabrielTofvesson/TeamAvionLauncher
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Updated version number

Browse Source
This commit is contained in:
Gabriel Tofvesson 2016-11-13 14:23:04 +01:00
parent 35c5e64dcd
commit 327cedc852
5 changed files with 18 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
.idea/artifacts/TAL_jar.xml generated Normal file
View File

@ -0,0 +1,10 @@
<component name="ArtifactManager">
<artifact type="jar" name="TAL:jar">
<output-path>$PROJECT_DIR$/out/artifacts/TAL_jar</output-path>
<root id="archive" name="TAL.jar">
<element id="module-output" name="TAL" />
<element id="extracted-dir" path="$APPLICATION_HOME_DIR$/redist/annotations-java8.jar" path-in-jar="/" />
<element id="extracted-dir" path="$PROJECT_DIR$/libs/libRefTools.jar" path-in-jar="/" />
</root>
</artifact>
</component>

7
src/Launcher/Main.java
View File

@ -29,7 +29,7 @@ import com.tofvesson.async.*;
public class Main extends Application { public class Main extends Application {
public static final URL mainLauncher = Main.class.getResource("../assets/layout/main.fxml"); // Launcher body public static final URL mainLauncher = Main.class.getResource("/assets/layout/main.fxml"); // Launcher body
private double xOffset = 0, yOffset = 0; // Offsets for dragging private double xOffset = 0, yOffset = 0; // Offsets for dragging
private Button exit, min, Home_btn, Modpack_btn, Settings_btn, Instance_btn; // Define buttons private Button exit, min, Home_btn, Modpack_btn, Settings_btn, Instance_btn; // Define buttons
@ -51,7 +51,7 @@ public class Main extends Application {
primaryStage.setScene(new Scene(root, 900, 500)); primaryStage.setScene(new Scene(root, 900, 500));
primaryStage.show(); primaryStage.show();
primaryStage.getIcons().clear(); primaryStage.getIcons().clear();
primaryStage.getIcons().add(appIcon = new Image(getClass().getResourceAsStream("../assets/icons/app.png"))); primaryStage.getIcons().add(appIcon = new Image(getClass().getResourceAsStream("/assets/icons/app.png")));
// Field initialization // Field initialization
exit = (Button) root.lookup("#exit"); exit = (Button) root.lookup("#exit");
@ -127,9 +127,6 @@ public class Main extends Application {
} }
}); });
System.out.println(settings_activeTab.getId());
Tabs.switchTab(settings_activeTab.getId().equals("Settings-Gen-btn") ? "settings_generic" : "settings_minecraft", (Pane) n.lookup("#Settings-Pane")); Tabs.switchTab(settings_activeTab.getId().equals("Settings-Gen-btn") ? "settings_generic" : "settings_minecraft", (Pane) n.lookup("#Settings-Pane"));
} }
}); });

4
src/Launcher/Tabs.java
View File

@ -21,7 +21,7 @@ public class Tabs {
*/ */
public static Node load(String fileName){ public static Node load(String fileName){
if(!fileName.endsWith(".fxml")) fileName+=".fxml"; if(!fileName.endsWith(".fxml")) fileName+=".fxml";
URL file = Main.class.getResource("../assets/layout/"+fileName); URL file = Main.class.getResource("/assets/layout/"+fileName);
try { try {
final boolean[] b = {false}; final boolean[] b = {false};
loaded.stream().filter(p -> p.getKey().equals(file)).forEach(p->b[0]=true); loaded.stream().filter(p -> p.getKey().equals(file)).forEach(p->b[0]=true);
@ -57,7 +57,7 @@ public class Tabs {
*/ */
public static void unloadTab(String fileName){ public static void unloadTab(String fileName){
if(!fileName.endsWith(".fxml")) fileName+=".fxml"; if(!fileName.endsWith(".fxml")) fileName+=".fxml";
URL file = Main.class.getResource("../assets/layout/"+fileName); URL file = Main.class.getResource("/assets/layout/"+fileName);
loaded.stream().filter(p->p.getKey().equals(file)).forEach(loaded::remove); loaded.stream().filter(p->p.getKey().equals(file)).forEach(loaded::remove);
} }

3
src/META-INF/MANIFEST.MF Normal file
View File

@ -0,0 +1,3 @@
Manifest-Version: 1.0
Main-Class: Launcher.Main

2
src/assets/layout/main.fxml
View File

@ -40,7 +40,7 @@
</font> </font>
</Button> </Button>
<Pane id="tab" layoutX="150.0" layoutY="50.0" prefHeight="450.0" prefWidth="750.0" /> <Pane id="tab" layoutX="150.0" layoutY="50.0" prefHeight="450.0" prefWidth="750.0" />
<Label layoutX="17.0" layoutY="455.0" text="Version : PreDev-0.0.2" textFill="white" /> <Label layoutX="17.0" layoutY="455.0" text="Version : PreDev-0.1.0" textFill="white" />
<Label layoutX="9.0" layoutY="472.0" text="Copyright 2016 TeamAvion" textFill="WHITE"> <Label layoutX="9.0" layoutY="472.0" text="Copyright 2016 TeamAvion" textFill="WHITE">
<font> <font>
<Font size="11.0" /> <Font size="11.0" />