diff options
Diffstat (limited to 'src/main/java/lance5057/tDefense/finishingAnvil')
| -rw-r--r-- | src/main/java/lance5057/tDefense/finishingAnvil/blocks/finishingAnvil/Gui_FinishingAnvil.java | 70 | ||||
| -rw-r--r-- | src/main/java/lance5057/tDefense/finishingAnvil/utilities/Injector.java | 51 |
2 files changed, 69 insertions, 52 deletions
diff --git a/src/main/java/lance5057/tDefense/finishingAnvil/blocks/finishingAnvil/Gui_FinishingAnvil.java b/src/main/java/lance5057/tDefense/finishingAnvil/blocks/finishingAnvil/Gui_FinishingAnvil.java index ea56f5a..3636b09 100644 --- a/src/main/java/lance5057/tDefense/finishingAnvil/blocks/finishingAnvil/Gui_FinishingAnvil.java +++ b/src/main/java/lance5057/tDefense/finishingAnvil/blocks/finishingAnvil/Gui_FinishingAnvil.java @@ -36,16 +36,16 @@ public class Gui_FinishingAnvil extends GuiContainer private ItemStack bigCopy; NBTTagCompound bigCopyTags; private final RenderItem bigRender = new RenderItem_FinishingAnvil( - this, - 3.5f, - 3.5f, 1.0f); + this, + 3.5f, + 3.5f, 1.0f); private ItemStack rightCopy1, rightCopy2, rightCopy3; NBTTagCompound rightCopyTags1, rightCopyTags2, - rightCopyTags3; + rightCopyTags3; private final RenderItem normalRender = new RenderItem_FinishingAnvil( - this, 1.0f, - 1.0f, 1.0f); + this, 1.0f, + 1.0f, 1.0f); //private Boolean isNull = true; private ItemStack editItem; @@ -68,8 +68,8 @@ public class Gui_FinishingAnvil extends GuiContainer InventoryPlayer player; private static final ResourceLocation iconLocation = new ResourceLocation( - "tinkersdefense", - "textures/gui/finishinganvil.png"); + "tinkersdefense", + "textures/gui/finishinganvil.png"); public Gui_FinishingAnvil(InventoryPlayer invPlayer, TileEntity_FinishingAnvil te) { @@ -511,12 +511,38 @@ public class Gui_FinishingAnvil extends GuiContainer final int test = button.getHoverState(mousehover); if(test == 2) { - if(bigCopy != null && bigCopy.getItem() instanceof ToolCore) + final List<String> list = new ArrayList(); + + if(bigCopy.getItem() instanceof ArmorCore) + { + bigCopy.getTagCompound().getCompoundTag("ArmorRenderer"); + final ArmorCore armor = (ArmorCore) bigCopy.getItem(); + final List<ModelRenderer> boxes = armor.getRenderer().boxList; + + switch(i) + { + case 0: + case 1: + case 2: + break; + + case 3: + list.add(boxes.get(rightButtonPos + 9).boxName); + break; + case 4: + list.add(boxes.get(rightButtonPos + 1 + 9).boxName); + break; + case 5: + list.add(boxes.get(rightButtonPos + 2 + 9).boxName); + break; + } + func_146283_a(list, x, y); + } + else if(bigCopy != null && bigCopy.getItem() instanceof ToolCore) { final ToolCore tool = (ToolCore) bigCopy.getItem(); final String toolName = tool.getUnlocalizedName().toLowerCase().substring(tool.getUnlocalizedName().lastIndexOf('.') + 1, tool.getUnlocalizedName().length()); final ToolCoreTip tt = ((Injector) TinkersDefense.tcInject).tools.get(toolName); - final List<String> list = new ArrayList(); if(tt != null) { @@ -549,31 +575,7 @@ public class Gui_FinishingAnvil extends GuiContainer } func_146283_a(list, x, y); } - else if(bigCopy.getItem() instanceof ArmorCore) - { - bigCopy.getTagCompound().getCompoundTag("ArmorRenderer"); - final ArmorCore armor = (ArmorCore) bigCopy.getItem(); - final List<ModelRenderer> boxes = armor.getRenderer().boxList; - switch(i) - { - case 0: - case 1: - case 2: - break; - - case 3: - list.add(boxes.get(rightButtonPos + 9).boxName); - break; - case 4: - list.add(boxes.get(rightButtonPos + 1 + 9).boxName); - break; - case 5: - list.add(boxes.get(rightButtonPos + 2 + 9).boxName); - break; - } - func_146283_a(list, x, y); - } else { list.add("Error - No name/desc!"); 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 |