diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index e6dc19d..3613958 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -4,7 +4,13 @@
-
+
+
+
+
+
+
+
@@ -12,10 +18,11 @@
+
-
+ {
+ "associatedIndex": 6
+}
@@ -26,6 +33,7 @@
"keyToString": {
"Application.Default CLI.executor": "Run",
"RunOnceActivity.ShowReadmeOnStart": "true",
+ "git-widget-placeholder": "master",
"kotlin-language-version-configured": "true",
"project.structure.last.edited": "Artifacts",
"project.structure.proportion": "0.15",
@@ -79,6 +87,7 @@
-
+
+
\ No newline at end of file
diff --git a/net/screwgravity/vitality4j/June.java b/net/screwgravity/vitality4j/June.java
new file mode 100644
index 0000000..107b98c
--- /dev/null
+++ b/net/screwgravity/vitality4j/June.java
@@ -0,0 +1,5 @@
+package net.screwgravity.vitality4j;
+
+public class June {
+ // todo
+}
diff --git a/src/Scotty.java b/net/screwgravity/vitality4j/Scotty.java
similarity index 92%
rename from src/Scotty.java
rename to net/screwgravity/vitality4j/Scotty.java
index 6d67cb1..76212f4 100644
--- a/src/Scotty.java
+++ b/net/screwgravity/vitality4j/Scotty.java
@@ -1,11 +1,10 @@
+package net.screwgravity.vitality4j;
+
import java.io.File;
import java.io.FileNotFoundException;
import java.io.InputStream;
-import java.nio.file.Path;
import java.util.ArrayList;
import java.util.List;
-import java.util.Random;
-import java.util.zip.Deflater;
import java.io.RandomAccessFile;
public class Scotty {
@@ -73,8 +72,9 @@ public class Scotty {
public PSARC(File location) { // existing
// todo: read psarc and set vars above
- try {fromDisk = new RandomAccessFile(location, "read");} catch (
- FileNotFoundException e) {throw new RuntimeException(e);
+ try {fromDisk = new RandomAccessFile(location, "read");} catch (FileNotFoundException e) {
+ if (standalone.fromTerminal) {System.out.println("File \"" + location.getAbsolutePath() +"\" not found.");System.exit(1);}
+ else {throw new RuntimeException(e);}
}
System.out.println();
diff --git a/src/standalone.java b/net/screwgravity/vitality4j/standalone.java
similarity index 96%
rename from src/standalone.java
rename to net/screwgravity/vitality4j/standalone.java
index 628d107..1859b4e 100644
--- a/src/standalone.java
+++ b/net/screwgravity/vitality4j/standalone.java
@@ -1,4 +1,7 @@
+package net.screwgravity.vitality4j;
+
public class standalone {
+ public static boolean fromTerminal = false;
public static final int[] version = new int[]{0, 0, 0};
// This is used when Vitality4J is run from the terminal.
// Don't make calls to anything in the standalone class when using Vitality4j as a library.
@@ -6,6 +9,7 @@ public class standalone {
// This is useful incase the user wants a standalone psarc.exe replacement
// and/or for debugging purposes without another Java project as the interface.
public static void main (String[] args) {
+ fromTerminal = true;
if (args.length == 0) {
System.out.println(
"usage: vita4j [options] \n" +
diff --git a/src/June.java b/src/June.java
deleted file mode 100644
index 8895302..0000000
--- a/src/June.java
+++ /dev/null
@@ -1,3 +0,0 @@
-public class June {
- // todo
-}
diff --git a/src/META-INF/MANIFEST.MF b/src/META-INF/MANIFEST.MF
deleted file mode 100644
index 8b17a9e..0000000
--- a/src/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,3 +0,0 @@
-Manifest-Version: 1.0
-Main-Class: standalone
-