Revert ItemParts.java, fix issue with ManualLoader

This commit is contained in:
modmuss50 2016-04-24 21:07:56 +01:00
parent d1ca1eaa74
commit b55c0a3c8e
2 changed files with 17 additions and 14 deletions

View file

@ -16,6 +16,7 @@ import org.apache.commons.io.IOUtils;
import com.google.gson.Gson;
import com.google.gson.reflect.TypeToken;
import reborncore.common.util.Unzip;
import techreborn.manual.PageCollection;
import techreborn.manual.Reference;
import techreborn.manual.loader.pages.CategoriesPage;
@ -84,7 +85,7 @@ public class ManualLoader {
}
if(hasIntactZip){
File outputDir = new File(manualdir, zipLocation.getName().replace(".zip", ""));
//Unzip.unzip(zipLocation, outputDir);
Unzip.unzip(zipLocation, outputDir);
File inputData = new File(outputDir, "master.json");
BufferedReader reader = new BufferedReader(new FileReader(inputData));
ManualLoader.format = gson.fromJson(reader, ManualFormat.class);