Rev 0

.gitignore

@@ -111,3 +111,5 @@ src/main/resources/tiles
 
 src/main/java/com/gamemode/tkviewer/ignore
 
+
+*.tsx

pom-tkviewer.xml → common/pom.xml

@@ -3,13 +3,16 @@
          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
-
-    <groupId>com.gamemode.tkviewer</groupId>
-    <artifactId>TKViewer</artifactId>
-    <version>3.3</version>
-    <name>TKViewer</name>
-    <description>NexusTK Resource Viewer</description>
-
+
+	<parent>
+		<groupId>com.gamemode.tkviewer</groupId>
+		<artifactId>tkviewer</artifactId>
+		<version>1.0.0-SNAPSHOT</version>
+	</parent>
+
+	<artifactId>common</artifactId>
+	<packaging>jar</packaging>
+
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <maven.compiler.source>8</maven.compiler.source>
@@ -18,43 +21,26 @@
     </properties>
 
     <build>
+		<sourceDirectory>${project.basedir}/src/main/java</sourceDirectory>
         <plugins>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-shade-plugin</artifactId>
-                <version>3.2.1</version>
-                <executions>
-                    <execution>
-                        <phase>package</phase>
-                        <goals>
-                            <goal>shade</goal>
-                        </goals>
-                        <configuration>
-                            <transformers>
-                                <transformer implementation="org.apache.maven.plugins.shade.resource.ManifestResourceTransformer">
-                                    <mainClass>com.gamemode.tkviewer.TKViewer</mainClass>
-                                </transformer>
-                            </transformers>
-                        </configuration>
-                    </execution>
-                </executions>
-            </plugin>
             <plugin>
                 <groupId>org.jetbrains.kotlin</groupId>
                 <artifactId>kotlin-maven-plugin</artifactId>
                 <version>${kotlin.version}</version>
-                <executions>
-                    <execution>
-                        <id>compile</id>
-                        <goals> <goal>compile</goal> </goals>
+				<executions>
+					<execution>
+						<id>compile</id>
+						<goals>
+							<goal>compile</goal>
+						</goals>
                         <configuration>
                             <sourceDirs>
                                 <sourceDir>${project.basedir}/src/main/kotlin</sourceDir>
                                 <sourceDir>${project.basedir}/src/main/java</sourceDir>
                             </sourceDirs>
                         </configuration>
-                    </execution>
-                </executions>
+					</execution>
+				</executions>
             </plugin>
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
@@ -85,27 +71,22 @@
         <dependency>
             <groupId>com.google.guava</groupId>
             <artifactId>guava</artifactId>
-            <version>28.0-jre</version>
         </dependency>
         <dependency>
             <groupId>net.imagej</groupId>
             <artifactId>ij</artifactId>
-            <version>1.52o</version>
         </dependency>
         <dependency>
             <groupId>commons-io</groupId>
             <artifactId>commons-io</artifactId>
-            <version>2.6</version>
         </dependency>
         <dependency>
             <groupId>org.jetbrains.kotlin</groupId>
             <artifactId>kotlin-stdlib-jdk8</artifactId>
-            <version>${kotlin.version}</version>
         </dependency>
         <dependency>
             <groupId>org.jetbrains.kotlin</groupId>
             <artifactId>kotlin-test</artifactId>
-            <version>${kotlin.version}</version>
             <scope>test</scope>
         </dependency>
     </dependencies>

src/main/java/com/gamemode/tkviewer/file_handlers/CmpFileHandler.java → common/src/main/java/com/gamemode/tkviewer/common/file_handlers/CmpFileHandler.java

@@ -1,6 +1,6 @@
-package com.gamemode.tkviewer.file_handlers;
+package com.gamemode.tkviewer.common.file_handlers;
 
-import com.gamemode.tkviewer.resources.Tile;
+import com.gamemode.tkviewer.common.Tile;
 
 import java.io.File;
 import java.nio.ByteBuffer;

src/main/java/com/gamemode/tkviewer/file_handlers/DatFileHandler.java → common/src/main/java/com/gamemode/tkviewer/common/file_handlers/DatFileHandler.java

@@ -1,12 +1,10 @@
-package com.gamemode.tkviewer.file_handlers;
+package com.gamemode.tkviewer.common.file_handlers;
 
 import java.io.File;
 import java.io.FileOutputStream;
 import java.io.IOException;
-import java.io.RandomAccessFile;
 import java.nio.ByteBuffer;
 import java.nio.file.Path;
-import java.util.HashMap;
 import java.util.LinkedHashMap;
 import java.util.Map;
 

src/main/java/com/gamemode/tkviewer/file_handlers/DnaFileHandler.java → common/src/main/java/com/gamemode/tkviewer/common/file_handlers/DnaFileHandler.java

@@ -1,12 +1,11 @@
-package com.gamemode.tkviewer.file_handlers;
+package com.gamemode.tkviewer.common.file_handlers;
 
-import com.gamemode.tkviewer.resources.Mob;
-import com.gamemode.tkviewer.resources.MobBlock;
-import com.gamemode.tkviewer.resources.MobChunk;
+import com.gamemode.tkviewer.common.Mob;
+import com.gamemode.tkviewer.common.MobBlock;
+import com.gamemode.tkviewer.common.MobChunk;
 
 import java.io.File;
 import java.nio.ByteBuffer;
-import java.nio.ByteOrder;
 import java.util.ArrayList;
 import java.util.List;
 

src/main/java/com/gamemode/tkviewer/file_handlers/DscFileHandler.java → common/src/main/java/com/gamemode/tkviewer/common/file_handlers/DscFileHandler.java

@@ -1,9 +1,9 @@
-package com.gamemode.tkviewer.file_handlers;
+package com.gamemode.tkviewer.common.file_handlers;
 
-import com.gamemode.tkviewer.resources.Part;
-import com.gamemode.tkviewer.resources.PartBlock;
-import com.gamemode.tkviewer.resources.PartChunk;
-import com.gamemode.tkviewer.resources.PartMetadata;
+import com.gamemode.tkviewer.common.Part;
+import com.gamemode.tkviewer.common.PartBlock;
+import com.gamemode.tkviewer.common.PartChunk;
+import com.gamemode.tkviewer.common.PartMetadata;
 
 import java.io.File;
 import java.nio.*;

src/main/java/com/gamemode/tkviewer/file_handlers/EfxTblFileHandler.java → common/src/main/java/com/gamemode/tkviewer/common/file_handlers/EfxTblFileHandler.java

@@ -1,7 +1,7 @@
-package com.gamemode.tkviewer.file_handlers;
+package com.gamemode.tkviewer.common.file_handlers;
 
-import com.gamemode.tkviewer.resources.Effect;
-import com.gamemode.tkviewer.resources.EffectFrame;
+import com.gamemode.tkviewer.common.Effect;
+import com.gamemode.tkviewer.common.EffectFrame;
 
 import java.io.File;
 import java.nio.ByteBuffer;

src/main/java/com/gamemode/tkviewer/file_handlers/EpfFileHandler.java → common/src/main/java/com/gamemode/tkviewer/common/file_handlers/EpfFileHandler.java

@@ -1,7 +1,7 @@
-package com.gamemode.tkviewer.file_handlers;
+package com.gamemode.tkviewer.common.file_handlers;
 
-import com.gamemode.tkviewer.resources.Frame;
-import com.gamemode.tkviewer.resources.Stencil;
+import com.gamemode.tkviewer.common.Frame;
+import com.gamemode.tkviewer.common.resources.Stencil;
 
 import java.awt.*;
 import java.io.File;

src/main/java/com/gamemode/tkviewer/file_handlers/FileHandler.java → common/src/main/java/com/gamemode/tkviewer/common/file_handlers/FileHandler.java

@@ -1,7 +1,6 @@
-package com.gamemode.tkviewer.file_handlers;
+package com.gamemode.tkviewer.common.file_handlers;
 
-import com.gamemode.tkviewer.resources.*;
-import com.google.common.primitives.UnsignedBytes;
+import com.gamemode.tkviewer.common.resources.*;
 
 import java.io.*;
 import java.nio.ByteBuffer;

src/main/java/com/gamemode/tkviewer/file_handlers/FileWriter.java → common/src/main/java/com/gamemode/tkviewer/common/file_handlers/FileWriter.java

@@ -1,4 +1,4 @@
-package com.gamemode.tkviewer.file_handlers;
+package com.gamemode.tkviewer.common.file_handlers;
 
 import java.io.File;
 import java.io.FileNotFoundException;

src/main/java/com/gamemode/tkviewer/file_handlers/FrmFileHandler.java → common/src/main/java/com/gamemode/tkviewer/common/file_handlers/FrmFileHandler.java

@@ -1,8 +1,7 @@
-package com.gamemode.tkviewer.file_handlers;
+package com.gamemode.tkviewer.common.file_handlers;
 
 import java.io.File;
 import java.nio.ByteBuffer;
-import java.nio.ByteOrder;
 import java.util.ArrayList;
 import java.util.List;
 

src/main/java/com/gamemode/tkviewer/file_handlers/MapFileHandler.java → common/src/main/java/com/gamemode/tkviewer/common/file_handlers/MapFileHandler.java

@@ -1,6 +1,6 @@
-package com.gamemode.tkviewer.file_handlers;
+package com.gamemode.tkviewer.common.file_handlers;
 
-import com.gamemode.tkviewer.resources.Tile;
+import com.gamemode.tkviewer.common.Tile;
 
 import java.io.File;
 import java.nio.ByteBuffer;

src/main/java/com/gamemode/tkviewer/file_handlers/PalFileHandler.java → common/src/main/java/com/gamemode/tkviewer/common/file_handlers/PalFileHandler.java

@@ -1,6 +1,8 @@
-package com.gamemode.tkviewer.file_handlers;
+package com.gamemode.tkviewer.common.file_handlers;
 
-import com.gamemode.tkviewer.resources.*;
+import com.gamemode.tkviewer.common.Color;
+import com.gamemode.tkviewer.common.Palette;
+import com.gamemode.tkviewer.common.PaletteMetadata;
 
 import java.io.File;
 import java.nio.*;

src/main/java/com/gamemode/tkviewer/file_handlers/SObjTblFileHandler.java → common/src/main/java/com/gamemode/tkviewer/common/file_handlers/SObjTblFileHandler.java

@@ -1,6 +1,6 @@
-package com.gamemode.tkviewer.file_handlers;
+package com.gamemode.tkviewer.common.file_handlers;
 
-import com.gamemode.tkviewer.resources.SObject;
+import com.gamemode.tkviewer.common.SObject;
 
 import java.io.File;
 import java.nio.*;

src/main/java/com/gamemode/tkviewer/file_handlers/TileTblFileHandler.java → common/src/main/java/com/gamemode/tkviewer/common/file_handlers/TileTblFileHandler.java

@@ -1,6 +1,6 @@
-package com.gamemode.tkviewer.file_handlers;
+package com.gamemode.tkviewer.common.file_handlers;
 
-import com.gamemode.tkviewer.resources.*;
+import com.gamemode.tkviewer.common.TblIndex;
 
 import java.io.File;
 import java.nio.ByteBuffer;

src/main/java/com/gamemode/tkviewer/render/EffectRenderer.java → common/src/main/java/com/gamemode/tkviewer/common/render/EffectRenderer.java

@@ -1,15 +1,17 @@
-package com.gamemode.tkviewer.render;
+package com.gamemode.tkviewer.common.render;
 
-import com.gamemode.tkviewer.file_handlers.*;
-import com.gamemode.tkviewer.resources.*;
-import com.gamemode.tkviewer.resources.Frame;
-import com.gamemode.tkviewer.utilities.FileUtils;
+import com.gamemode.tkviewer.common.EffectFrame;
+import com.gamemode.tkviewer.common.EffectImage;
+import com.gamemode.tkviewer.common.Palette;
+import com.gamemode.tkviewer.common.file_handlers.*;
+import com.gamemode.tkviewer.common.Frame;
+import com.gamemode.tkviewer.common.resources.Resources;
+import com.gamemode.tkviewer.common.utilities.FileUtils;
 
 import java.awt.*;
 import java.awt.image.*;
 import java.io.*;
 import java.util.ArrayList;
-import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 

src/main/java/com/gamemode/tkviewer/render/MapRenderer.java → common/src/main/java/com/gamemode/tkviewer/common/render/MapRenderer.java

@@ -1,18 +1,14 @@
-package com.gamemode.tkviewer.render;
+package com.gamemode.tkviewer.common.render;
 
-import com.gamemode.tkviewer.file_handlers.CmpFileHandler;
-import com.gamemode.tkviewer.file_handlers.MapFileHandler;
-import com.gamemode.tkviewer.resources.Resources;
-import com.gamemode.tkviewer.utilities.FileUtils;
-import com.gamemode.tkviewer.utilities.Utils;
+import com.gamemode.tkviewer.common.file_handlers.CmpFileHandler;
+import com.gamemode.tkviewer.common.file_handlers.MapFileHandler;
+import com.gamemode.tkviewer.common.resources.Resources;
+import com.gamemode.tkviewer.common.utilities.Utils;
 
 import java.awt.Color;
 import java.awt.Graphics2D;
 import java.awt.image.BufferedImage;
 import java.io.File;
-import java.nio.Buffer;
-import java.nio.file.Path;
-import java.nio.file.Paths;
 
 public class MapRenderer {
 

src/main/java/com/gamemode/tkviewer/render/MobRenderer.java → common/src/main/java/com/gamemode/tkviewer/common/render/MobRenderer.java

@@ -1,12 +1,13 @@
-package com.gamemode.tkviewer.render;
-
-import com.gamemode.tkviewer.file_handlers.DatFileHandler;
-import com.gamemode.tkviewer.file_handlers.DnaFileHandler;
-import com.gamemode.tkviewer.file_handlers.EpfFileHandler;
-import com.gamemode.tkviewer.file_handlers.PalFileHandler;
-import com.gamemode.tkviewer.resources.*;
-import com.gamemode.tkviewer.resources.Frame;
-import com.gamemode.tkviewer.utilities.FileUtils;
+package com.gamemode.tkviewer.common.render;
+
+import com.gamemode.tkviewer.common.*;
+import com.gamemode.tkviewer.common.Frame;
+import com.gamemode.tkviewer.common.file_handlers.DatFileHandler;
+import com.gamemode.tkviewer.common.file_handlers.DnaFileHandler;
+import com.gamemode.tkviewer.common.file_handlers.EpfFileHandler;
+import com.gamemode.tkviewer.common.file_handlers.PalFileHandler;
+import com.gamemode.tkviewer.common.resources.Resources;
+import com.gamemode.tkviewer.common.utilities.FileUtils;
 
 import java.awt.*;
 import java.awt.image.*;

src/main/java/com/gamemode/tkviewer/render/PartRenderer.java → common/src/main/java/com/gamemode/tkviewer/common/render/PartRenderer.java

@@ -1,13 +1,14 @@
-package com.gamemode.tkviewer.render;
-
-import com.gamemode.tkviewer.file_handlers.DatFileHandler;
-import com.gamemode.tkviewer.file_handlers.DscFileHandler;
-import com.gamemode.tkviewer.file_handlers.EpfFileHandler;
-import com.gamemode.tkviewer.file_handlers.PalFileHandler;
-import com.gamemode.tkviewer.resources.*;
-import com.gamemode.tkviewer.resources.Frame;
-import com.gamemode.tkviewer.utilities.FileUtils;
-import com.gamemode.tkviewer.utilities.RenderUtils;
+package com.gamemode.tkviewer.common.render;
+
+import com.gamemode.tkviewer.common.*;
+import com.gamemode.tkviewer.common.Frame;
+import com.gamemode.tkviewer.common.file_handlers.DatFileHandler;
+import com.gamemode.tkviewer.common.file_handlers.DscFileHandler;
+import com.gamemode.tkviewer.common.file_handlers.EpfFileHandler;
+import com.gamemode.tkviewer.common.file_handlers.PalFileHandler;
+import com.gamemode.tkviewer.common.resources.Resources;
+import com.gamemode.tkviewer.common.utilities.FileUtils;
+import com.gamemode.tkviewer.common.utilities.RenderUtils;
 
 import java.awt.*;
 import java.awt.image.*;

src/main/java/com/gamemode/tkviewer/render/Renderer.java → common/src/main/java/com/gamemode/tkviewer/common/render/Renderer.java

@@ -1,4 +1,4 @@
-package com.gamemode.tkviewer.render;
+package com.gamemode.tkviewer.common.render;
 
 import java.awt.*;