summaryrefslogtreecommitdiff
path: root/src/main/java/lance5057/tDefense/finishingAnvil/utilities
diff options
context:
space:
mode:
authorLance5057 <Lance5057@gmail.com>2016-08-14 05:17:34 -0500
committerLance5057 <Lance5057@gmail.com>2016-08-14 05:17:34 -0500
commit27ab16cd8d4e6ee3219dd9be768b0570f6ae5050 (patch)
treea4a648c933247c9b84a76327727303d54e39a9cc /src/main/java/lance5057/tDefense/finishingAnvil/utilities
parentd10fd21692bad49e75a7d665005df940c91942f8 (diff)
Fixed bugs in the issue tracker.
Server issue Thaumium issue Vis Modifier issues
Diffstat (limited to 'src/main/java/lance5057/tDefense/finishingAnvil/utilities')
-rw-r--r--src/main/java/lance5057/tDefense/finishingAnvil/utilities/Injector.java51
1 files changed, 33 insertions, 18 deletions
diff --git a/src/main/java/lance5057/tDefense/finishingAnvil/utilities/Injector.java b/src/main/java/lance5057/tDefense/finishingAnvil/utilities/Injector.java
index 2b754f0..9b2138f 100644
--- a/src/main/java/lance5057/tDefense/finishingAnvil/utilities/Injector.java
+++ b/src/main/java/lance5057/tDefense/finishingAnvil/utilities/Injector.java
@@ -1,7 +1,6 @@
package lance5057.tDefense.finishingAnvil.utilities;
import java.io.IOException;
-import java.net.URISyntaxException;
import java.nio.file.FileSystem;
import java.nio.file.FileSystems;
import java.nio.file.Files;
@@ -12,6 +11,7 @@ import java.util.HashMap;
import java.util.List;
import java.util.Map;
+import lance5057.tDefense.Reference;
import lance5057.tDefense.TinkersDefense;
import net.minecraft.client.Minecraft;
import net.minecraft.client.renderer.texture.IIconRegister;
@@ -37,7 +37,7 @@ public class Injector extends ToolCore
super(0);
}
- protected void loadHeads(IIconRegister iconRegister) throws IOException, URISyntaxException
+ protected void loadHeads(IIconRegister iconRegister)
{
// final URL jarFile =
@@ -55,14 +55,38 @@ public class Injector extends ToolCore
//final List<String> filenames = new ArrayList<String>();
//final File files = new File(Minecraft.getMinecraft().mcDataDir.getPath() + "/mods/tinkersdefense-1.3.6.jar");
- final Path zipfile = Paths.get(Minecraft.getMinecraft().mcDataDir.getPath() + "/mods/tinkersdefense-1.3.6.jar");
- final FileSystem fs = FileSystems.newFileSystem(zipfile, Minecraft.class.getClassLoader());
+ final Path zipfile = Paths.get(Minecraft.getMinecraft().mcDataDir.getPath() + "/mods/" + Reference.MOD_ID + "-" + Reference.VERSION + ".jar");
+ // if(Files.exists(zipfile))
+ // {
+ Path root = null;
+ FileSystem fs;
+ try
+ {
+ fs = FileSystems.newFileSystem(zipfile, Minecraft.class.getClassLoader());
+ root = fs.getPath(path);
+ }
+ catch(final IOException e)
+ {
+ // TODO Auto-generated catch block
+ //e.printStackTrace();
+ continue;
+ }
- final Path root = fs.getPath(path);
//final Iterable<FileStore> files = fs.getFileStores();
final FileGetter fileget = new FileGetter();
- Files.walkFileTree(root, fileget);
+ if(root != null)
+ {
+ try
+ {
+ Files.walkFileTree(root, fileget);
+ }
+ catch(final IOException e)
+ {
+ // TODO Auto-generated catch block
+ e.printStackTrace();
+ }
+ }
//IDE
//final File files = new File(url.toURI());
@@ -78,6 +102,8 @@ public class Injector extends ToolCore
}
}
+ // }
+
//}
//}
@@ -235,18 +261,7 @@ public class Injector extends ToolCore
@Override
public void registerIcons(IIconRegister iconRegister)
{
- try
- {
- loadHeads(iconRegister);
- }
- catch(final IOException e)
- {
- System.out.print("No Finishing Anvil for you");
- }
- catch(final URISyntaxException e)
- {
- System.out.print("No Finishing Anvil for you");
- }
+ loadHeads(iconRegister);
}
@Override