diff --git a/resources/assets/tinker/textures/items/broadsword/copper_sword_blade.png.bla b/resources/assets/tinker/textures/items/broadsword/copper_sword_blade.png.bla deleted file mode 100644 index e08d9769..00000000 Binary files a/resources/assets/tinker/textures/items/broadsword/copper_sword_blade.png.bla and /dev/null differ diff --git a/src/main/java/tconstruct/library/tools/ToolCore.java b/src/main/java/tconstruct/library/tools/ToolCore.java index 100bb195..d4fce5a6 100644 --- a/src/main/java/tconstruct/library/tools/ToolCore.java +++ b/src/main/java/tconstruct/library/tools/ToolCore.java @@ -166,6 +166,17 @@ public abstract class ToolCore extends Item implements IEnergyContainerItem, IMo public abstract String getDefaultFolder (); + /** + * Returns the COMPLETE resource path. + * Example: tinker:broadsword + * + * @return + */ + public String getDefaultTexturePath() + { + return "tinker:" + getDefaultFolder(); + } + public void registerPartPaths (int index, String[] location) { headStrings.put(index, location[0]); @@ -208,8 +219,11 @@ public abstract class ToolCore extends Item implements IEnergyContainerItem, IMo icons.put(entry.getKey(), iconRegister.registerIcon(entry.getValue())); } + // get the mod id stuff. + + if(standard != null && !standard.isEmpty()) { - standard = "tinker:" + getDefaultFolder() + "/" + standard; + standard = getDefaultTexturePath() + "/" + standard; icons.put(-1, iconRegister.registerIcon(standard)); } }