From 9ba6580409cbae0762f501ebdae34bf612d6665e Mon Sep 17 00:00:00 2001
From: Downforce Agent <bonkmaykr@protonmail.com>
Date: Mon, 12 Aug 2024 20:20:20 -0500
Subject: [PATCH] rebase; move to package, prepare header read io

---
 .idea/workspace.xml                           | 19 ++++++++++++++-----
 net/screwgravity/vitality4j/June.java         |  5 +++++
 .../screwgravity/vitality4j}/Scotty.java      | 10 +++++-----
 .../screwgravity/vitality4j}/standalone.java  |  4 ++++
 src/June.java                                 |  3 ---
 src/META-INF/MANIFEST.MF                      |  3 ---
 6 files changed, 28 insertions(+), 16 deletions(-)
 create mode 100644 net/screwgravity/vitality4j/June.java
 rename {src => net/screwgravity/vitality4j}/Scotty.java (92%)
 rename {src => net/screwgravity/vitality4j}/standalone.java (96%)
 delete mode 100644 src/June.java
 delete mode 100644 src/META-INF/MANIFEST.MF

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 @@
     <option name="autoReloadType" value="SELECTIVE" />
   </component>
   <component name="ChangeListManager">
-    <list default="true" id="cf74c012-cc69-4732-ac79-9ddfcbf803ee" name="Changes" comment="help screen" />
+    <list default="true" id="cf74c012-cc69-4732-ac79-9ddfcbf803ee" name="Changes" comment="initial structuring">
+      <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/June.java" beforeDir="false" afterPath="$PROJECT_DIR$/net/screwgravity/vitality4j/June.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/META-INF/MANIFEST.MF" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/Scotty.java" beforeDir="false" afterPath="$PROJECT_DIR$/net/screwgravity/vitality4j/Scotty.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/standalone.java" beforeDir="false" afterPath="$PROJECT_DIR$/net/screwgravity/vitality4j/standalone.java" afterDir="false" />
+    </list>
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
     <option name="HIGHLIGHT_NON_ACTIVE_CHANGELIST" value="false" />
@@ -12,10 +18,11 @@
   </component>
   <component name="Git.Settings">
     <option name="RECENT_GIT_ROOT_PATH" value="$PROJECT_DIR$" />
+    <option name="UPDATE_TYPE" value="REBASE" />
   </component>
-  <component name="ProjectColorInfo"><![CDATA[{
-  "associatedIndex": 6
-}]]></component>
+  <component name="ProjectColorInfo">{
+  &quot;associatedIndex&quot;: 6
+}</component>
   <component name="ProjectId" id="2kSX0H5aEqubJw0msd83khpA5nj" />
   <component name="ProjectLevelVcsManager" settingsEditedManually="true" />
   <component name="ProjectViewState">
@@ -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 @@
   <component name="VcsManagerConfiguration">
     <MESSAGE value="eclipse compiler adjustments" />
     <MESSAGE value="help screen" />
-    <option name="LAST_COMMIT_MESSAGE" value="help screen" />
+    <MESSAGE value="initial structuring" />
+    <option name="LAST_COMMIT_MESSAGE" value="initial structuring" />
   </component>
 </project>
\ 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] <file>\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
-