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

@ -15,15 +15,17 @@ import techreborn.init.ModItems;
import techreborn.lib.ModInfo; import techreborn.lib.ModInfo;
public class ItemParts extends ItemTextureBase { public class ItemParts extends ItemTextureBase {
public static final String[] types = new String[] { "dataControlCircuit", "dataOrb", "diamondGrindingHead", public static final String[] types = new String[] { "advancedCircuitParts", "basicCircuitBoard",
"diamondSawBlade", "wolframiumGrindingHead", "heliumCoolantSimple", "heliumCoolantTriple", "advancedCircuitBoard", "processorCircuitBoard", "energyFlowCircuit", "dataControlCircuit", "dataOrb",
"heliumCoolantSix", "NaKCoolantSimple", "NaKCoolantTriple", "NaKCoolantSix", "cupronickelHeatingCoil", "dataStorageCircuit", "diamondGrindingHead", "diamondSawBlade", "tungstenGrindingHead",
"nichromeHeatingCoil", "kanthalHeatingCoil", "lazuriteChunk", "iridiumAlloyIngot", "rockCutterBlade", "heliumCoolantSimple", "HeliumCoolantTriple", "HeliumCoolantSix", "NaKCoolantSimple", "NaKCoolantTriple",
"superConductor", "thoriumCell", "doubleThoriumCell", "quadThoriumCell", "plutoniumCell", "NaKCoolantSix", "cupronickelHeatingCoil", "nichromeHeatingCoil", "kanthalHeatingCoil", "laserFocus",
"doublePlutoniumCell", "quadPlutoniumCell", "computerMonitor", "machineParts", "neutronReflector", "ductTape", "lazuriteChunk", "iridiumAlloyIngot", "rockCutterBlade", "superConductor", "thoriumCell",
"iridiumNeutronReflector", "thickNeutronReflector", "electronicCircuit", "advancedCircuit", "rubberSap", "doubleThoriumCell", "quadThoriumCell", "plutoniumCell", "doublePlutoniumCell", "quadPlutoniumCell",
"rubber", "scrap", "advancedAlloy", "mixedmetalingot", "carbonmesh", "carbonfiber", "coolantSimple", "destructoPack", "iridiumNeutronReflector", "massHoleDevice", "computerMonitor", "machineParts",
"coolantTriple", "coolantSix" }; "thickNeutronReflector", "neutronReflector", "electronicCircuit", "advancedCircuit", "rubberSap", "rubber",
"scrap", "pump", "teleporter", "advancedAlloy", "mixedmetalingot", "carbonmesh", "carbonfiber", "dogecoin",
"CoolantSimple", "CoolantTriple", "CoolantSix" };
public ItemParts() { public ItemParts() {
setCreativeTab(TechRebornCreativeTab.instance); setCreativeTab(TechRebornCreativeTab.instance);

View file

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