Bumped version 1.2 with a couple small fixes.

osrsbox · May 13, 2021 · 4d041ec · 4d041ec
1 parent 22d7d1c
commit 4d041ec
Show file tree

Hide file tree

Showing 6 changed files with 44 additions and 17 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -0,0 +1,32 @@
+## CHANGELOG
+
+### Version 1.2
+
+- Added changelog
+- Fixed NPC output dir name
+- Fixed flatcache default (again)
+- Bumped cache submodule
+
+```
+0b455e47d8dc0ab932a6a3b9c5293617  squirrel.jar
+44d9fdf30b9ecc6435d6aa70c43cf0ca23d58fc9  squirrel.jar
+
+```
+
+### Version 1.1
+
+- Fixed bug stopping default flatcache load
+
+```
+d993ed76e99300da9986f9212033ffa4  squirrel.jar
+68a7aecfb9f6ca55d2552df8a4627a77e7e5876e  squirrel.jar
+```
+
+### Version 1.0 
+
+- Initial release
+
+```
+f9130a95882f18f566667c10353690bb  squirrel.jar
+7508e720399489654c8d83b8e66336172ce92682  squirrel.jar
+```
diff --git a/README.md b/README.md
@@ -54,7 +54,7 @@ java -jar squirrel.jar -v
 If you want to update the `osrs-cache` submodule (which I will probably not constantly update after each weekly update) just use git. For example, in the root folder run:
 
 ```
-git submodule update --init
+git submodule update --recursive --remote
 ```
 
 ## Using a Specific Cache Version
@@ -127,17 +127,7 @@ The project configuration (`pom.xml` file) specifies for an uber-jar to be creat
 
 If you are really worried. Check the source code, then compile yourself :)
 
-If you are semi-worried. Check the MD5 or SHA1 hash values of the `squirrel.jar` file:
-
-```
-# Version 1.0 hashes
-f9130a95882f18f566667c10353690bb  squirrel.jar
-7508e720399489654c8d83b8e66336172ce92682  squirrel.jar
-
-# Version 1.1 hashes
-d993ed76e99300da9986f9212033ffa4  squirrel.jar
-68a7aecfb9f6ca55d2552df8a4627a77e7e5876e  squirrel.jar
-```
+If you are semi-worried. Check the MD5 or SHA1 hash values of the `squirrel.jar` file - available in the `CHANGELOG.md` file.
 
 ## Tests
 

diff --git a/osrs-cache b/osrs-cache
diff --git a/pom.xml b/pom.xml
@@ -5,7 +5,7 @@
 
   <groupId>com.osrsbox</groupId>
   <artifactId>squirrel</artifactId>
-  <version>1.1</version>
+  <version>1.2</version>
   <packaging>jar</packaging>
   <name>squirrel</name>
   <description>Climbing trees. Eating nuts. Parsing cache.</description>
@@ -15,7 +15,7 @@
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
     <maven.compiler.source>1.7</maven.compiler.source>
     <maven.compiler.target>1.7</maven.compiler.target>
-    <runelite-version>1.7.3</runelite-version>
+    <runelite-version>1.7.6</runelite-version>
   </properties>
 
   <repositories>
@@ -50,6 +50,11 @@
       <artifactId>slf4j-simple</artifactId>
       <version>1.7.30</version>
     </dependency>
+    <dependency>
+			<groupId>com.google.code.gson</groupId>
+			<artifactId>gson</artifactId>
+      <version>2.8.6</version>
+		</dependency>
   </dependencies>
 
   <build>

diff --git a/squirrel.jar b/squirrel.jar
diff --git a/src/main/java/com/osrsbox/squirrel/Nuts.java b/src/main/java/com/osrsbox/squirrel/Nuts.java
@@ -88,7 +88,7 @@ else if (cmd.hasOption("flatcache"))
 		}
 		else
 		{
-			String cache = cmd.getOptionValue("osrs-cache");
+			String cache = "osrs-cache";
 			System.out.println("[*] Loading default flatcache from: " + cache);
 			store = loadStoreFlat(cache);
 		}
@@ -114,7 +114,7 @@ else if (cmd.hasOption("npcs"))
 
 			if (npcdir == null)
 			{
-				npcdir = "dumped-objects";
+				npcdir = "dumped-npcs";
 			}
 
 			System.out.println("[*] Dumping npcs to: " + npcdir);
+1,560 −6		0.flatcache
+55 −6		1.flatcache
+770 −245		12.flatcache
+8 −8		13.flatcache
+34 −23		16.flatcache
+86 −58		18.flatcache
+24 −14		19.flatcache
+884 −89		2.flatcache
+36 −8		20.flatcache
+129 −412		3.flatcache
+184 −2		4.flatcache
+200 −130		5.flatcache
+22 −1		6.flatcache
+1,536 −206		7.flatcache
+1,543 −1,172		8.flatcache