diff --git a/cache/src/main/java/net/runelite/cache/Cache.java b/cache/src/main/java/net/runelite/cache/Cache.java index a6d9d4649c..8a2ed12596 100644 --- a/cache/src/main/java/net/runelite/cache/Cache.java +++ b/cache/src/main/java/net/runelite/cache/Cache.java @@ -204,10 +204,10 @@ public class Cache private static void dumpObjects(Store store, File objectdir) throws IOException { - ObjectDumper dumper = new ObjectDumper(store, objectdir, objectdir); + ObjectManager dumper = new ObjectManager(store); dumper.load(); - dumper.dump(); - dumper.java(); + dumper.dump(objectdir); + dumper.java(objectdir); } private static void dumpSprites(Store store, File spritedir) throws IOException diff --git a/cache/src/main/java/net/runelite/cache/ObjectDumper.java b/cache/src/main/java/net/runelite/cache/ObjectManager.java similarity index 83% rename from cache/src/main/java/net/runelite/cache/ObjectDumper.java rename to cache/src/main/java/net/runelite/cache/ObjectManager.java index cf33b561aa..804751af13 100644 --- a/cache/src/main/java/net/runelite/cache/ObjectDumper.java +++ b/cache/src/main/java/net/runelite/cache/ObjectManager.java @@ -24,38 +24,28 @@ */ package net.runelite.cache; -import com.google.gson.Gson; -import com.google.gson.GsonBuilder; import java.io.File; -import java.io.FileWriter; import java.io.IOException; import java.io.PrintWriter; import java.util.ArrayList; import java.util.List; import net.runelite.cache.definitions.ObjectDefinition; +import net.runelite.cache.definitions.exporters.ObjectExporter; import net.runelite.cache.definitions.loaders.ObjectLoader; import net.runelite.cache.fs.Archive; import net.runelite.cache.fs.Index; import net.runelite.cache.fs.Store; import net.runelite.cache.util.Namer; -public class ObjectDumper +public class ObjectManager { private final Store store; - private final File out, java; - private final Gson gson; private final List objects = new ArrayList<>(); private final Namer namer = new Namer(); - public ObjectDumper(Store store, File out, File java) + public ObjectManager(Store store) { this.store = store; - this.out = out; - this.java = java; - - GsonBuilder builder = new GsonBuilder() - .setPrettyPrinting(); - gson = builder.create(); } public void load() throws IOException @@ -72,20 +62,25 @@ public class ObjectDumper } } - public void dump() throws IOException + public List getObjects() { + return objects; + } + + public void dump(File out) throws IOException + { + out.mkdirs(); + for (ObjectDefinition def : objects) { - out.mkdirs(); - java.io.File targ = new java.io.File(out, def.getId() + ".json"); - try (FileWriter fw = new FileWriter(targ)) - { - fw.write(gson.toJson(def)); - } + ObjectExporter exporter = new ObjectExporter(def); + + File targ = new File(out, def.getId() + ".json"); + exporter.exportTo(targ); } } - public void java() throws IOException + public void java(File java) throws IOException { java.mkdirs(); java.io.File targ = new java.io.File(java, "ObjectID.java"); diff --git a/cache/src/main/java/net/runelite/cache/definitions/exporters/ObjectExporter.java b/cache/src/main/java/net/runelite/cache/definitions/exporters/ObjectExporter.java new file mode 100644 index 0000000000..994bff625f --- /dev/null +++ b/cache/src/main/java/net/runelite/cache/definitions/exporters/ObjectExporter.java @@ -0,0 +1,60 @@ +/* + * Copyright (c) 2016-2017, Adam + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions are met: + * + * 1. Redistributions of source code must retain the above copyright notice, this + * list of conditions and the following disclaimer. + * 2. Redistributions in binary form must reproduce the above copyright notice, + * this list of conditions and the following disclaimer in the documentation + * and/or other materials provided with the distribution. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND + * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED + * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE + * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR + * ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES + * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND + * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT + * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS + * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + */ +package net.runelite.cache.definitions.exporters; + +import com.google.gson.Gson; +import com.google.gson.GsonBuilder; +import java.io.File; +import java.io.FileWriter; +import java.io.IOException; +import net.runelite.cache.definitions.ObjectDefinition; + +public class ObjectExporter +{ + private final ObjectDefinition object; + private final Gson gson; + + public ObjectExporter(ObjectDefinition object) + { + this.object = object; + + GsonBuilder builder = new GsonBuilder() + .setPrettyPrinting(); + gson = builder.create(); + } + + public String export() + { + return gson.toJson(object); + } + + public void exportTo(File file) throws IOException + { + try (FileWriter fw = new FileWriter(file)) + { + fw.write(export()); + } + } +} diff --git a/cache/src/test/java/net/runelite/cache/ObjectDumperTest.java b/cache/src/test/java/net/runelite/cache/ObjectManagerTest.java similarity index 92% rename from cache/src/test/java/net/runelite/cache/ObjectDumperTest.java rename to cache/src/test/java/net/runelite/cache/ObjectManagerTest.java index b173d53dee..f50196734e 100644 --- a/cache/src/test/java/net/runelite/cache/ObjectDumperTest.java +++ b/cache/src/test/java/net/runelite/cache/ObjectManagerTest.java @@ -33,9 +33,9 @@ import org.junit.rules.TemporaryFolder; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -public class ObjectDumperTest +public class ObjectManagerTest { - private static final Logger logger = LoggerFactory.getLogger(ObjectDumperTest.class); + private static final Logger logger = LoggerFactory.getLogger(ObjectManagerTest.class); @Rule public TemporaryFolder folder = StoreLocation.getTemporaryFolder(); @@ -50,14 +50,12 @@ public class ObjectDumperTest { store.load(); - ObjectDumper dumper = new ObjectDumper( - store, - dumpDir, - javaDir + ObjectManager dumper = new ObjectManager( + store ); dumper.load(); - dumper.dump(); - dumper.java(); + dumper.dump(dumpDir); + dumper.java(javaDir); } logger.info("Dumped to {}, java {}", dumpDir, javaDir);