Created resources folder

.classpath

@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
 	<classpathentry kind="src" path="src"/>
+	<classpathentry kind="src" path="res"/>
 	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-12">
 		<attributes>
 			<attribute name="module" value="true"/>

pack_bgm.csv

@@ -1,21 +0,0 @@
-Track	Title	Artist	Album
-1	Explorers	Hiroshi Okubo	Green Album
-2	Valley of the Mind	SamplingMasters MEGA	Green Album
-3	Nitro Mantra	SamplingMasters AYA	Green Album
-4	I Want You	SamplingMasters AYA	Green Album
-5	Road Mauler	Rio Hamamoto	Green Album
-6	Floodlight	sanodg	White Album
-7	Drift Psychosis	Hiroshi Okubo	White Album
-8	Sue?o Del Mar	Asuka Sakai	White Album
-9	Trail of Light	J99	White Album
-10	Ultra Cruise	Tetsukazu Nakanishi	White Album
-11	Highway Fusion	SamplingMasters MEGA	Black Album
-12	Acid Eutron #001	Acid Eutron	Black Album
-13	Radiance	sanodg	Black Album
-14	Photon Field	Koji Nakagawa	Black Album
-15	Galactic Life	"Kohta ""SOLIDSTATE"" Takahashi"	Black Album
-16	Run PAC-MAN Run!	Akitaka Tohyama	Black Album
-17			
-18			
-19			
-20			

res/pack_bgm.csv

@@ -0,0 +1,21 @@
+Track,Title,Artist,Album
+1,Explorers,Hiroshi Okubo,Green Album
+2,Valley of the Mind,SamplingMasters MEGA,Green Album
+3,Nitro Mantra,SamplingMasters AYA,Green Album
+4,I Want You,SamplingMasters AYA,Green Album
+5,Road Mauler,Rio Hamamoto,Green Album
+6,Floodlight,sanodg,White Album
+7,Drift Psychosis,Hiroshi Okubo,White Album
+8,Sue?o Del Mar,Asuka Sakai,White Album
+9,Trail of Light,J99,White Album
+10,Ultra Cruise,Tetsukazu Nakanishi,White Album
+11,Highway Fusion,SamplingMasters MEGA,Black Album
+12,Acid Eutron #001,Acid Eutron,Black Album
+13,Radiance,sanodg,Black Album
+14,Photon Field,Koji Nakagawa,Black Album
+15,Galactic Life,"Kohta ""SOLIDSTATE"" Takahashi",Black Album
+16,Run PAC-MAN Run!,Akitaka Tohyama,Black Album
+17,,,
+18,,,
+19,,,
+20,,,

src/goblincave/gitea/nes/AudioExtractor.java

@@ -98,11 +98,14 @@ public class AudioExtractor {
 			Thread.sleep(500);
 			
 		} else {
+			
 			// WIDE LOGO
 			System.out.println(Ansi.colorize(logoFormat("Ridge Racer 6"), Attribute.BRIGHT_RED_TEXT()));
 			Thread.sleep(500);
+			
 			System.out.println(Ansi.colorize(logoFormat("Audio Extractor", true, 8), Attribute.YELLOW_TEXT()));
 			Thread.sleep(500);
+			
 		}
 		
 		// Print meta info
@@ -452,33 +455,16 @@ public class AudioExtractor {
 			}
 			
 			// Determine size of data chunk
-			if(dataAddress > -1) {
+			int dataSize;
-				
+			if(dataAddress > -1)
-				file.seek(dataAddress + 4);
+				dataSize = readChunkSize(file, dataAddress);
-				byte[] buffer = new byte[4];
+			else throw new IOException("Data chunk not in file.");
-				file.read(buffer);
-				
-				int dataSize = 8 + buffer[3] 
-						+ buffer[2] * (int) Math.pow(16, 2) 
-						+ buffer[1] * (int) Math.pow(16, 4)
-						+ buffer[0] * (int) Math.pow(16, 6);
-				
-			} else throw new IOException("Data chunk not in file.");
 			
 			// Determine size of smpl chunk
-			if(smplAddress > -1) {
+			int smplSize;
-				
+			if(smplAddress > -1)
-				file.seek(smplAddress + 4);
+				smplSize = readChunkSize(file, smplAddress);	
-				byte[] buffer = new byte[4];
+			// smpl chunk may not already exist
-				file.read(buffer); // write size bytes to buffer
-				
-				// calculate expected chunk size
-				int smplSize = 8 + buffer[3] 
-						+ buffer[2] * (int) Math.pow(16, 2) 
-						+ buffer[1] * (int) Math.pow(16, 4)
-						+ buffer[0] * (int) Math.pow(16, 6);
-				
-			} // smpl chunk may not already exist
 			
 			// Create new sample chunk
 				// Insert 68-byte sample chunk with loop before data chunk
@@ -681,7 +667,7 @@ public class AudioExtractor {
 	private static String retrieveOperation(BufferedReader reader, String input) {
 		
 		String operation = null;
-		String[] values = {"extract", "package", "patch", "print", "exit"};
+		String[] values = {"extract", "pack", "patch", "print", "exit"};
 		
 		if(input != null)
 			for(int i = 0; i < values.length; i++)
@@ -692,7 +678,7 @@ public class AudioExtractor {
 		
 			String prompt = "\n" + Ansi.colorize("Operations", Attribute.BRIGHT_YELLOW_TEXT(), Attribute.BOLD()) + ":\n"
 					+ "- " + Ansi.colorize("Extract", Attribute.BRIGHT_RED_TEXT()) + " audio tracks from package\n"
-					+ "- " + Ansi.colorize("Package", Attribute.YELLOW_TEXT()) + " audio tracks into package\n"
+					+ "- " + Ansi.colorize("Pack", Attribute.YELLOW_TEXT()) + " audio tracks into package\n"
 					+ "- " + Ansi.colorize("Patch", Attribute.BRIGHT_GREEN_TEXT()) + " audio track to loop indefinitely\n"
 					+ "- " + Ansi.colorize("Print", Attribute.BRIGHT_BLUE_TEXT()) + " Ridge Racer 6 style ASCII logo\n"
 					+ "- " + Ansi.colorize("Exit", Attribute.BRIGHT_MAGENTA_TEXT()) + " program\n"