From 14aebe9d84278783eb8f8a3b66d09abd704fb07a Mon Sep 17 00:00:00 2001 From: Bernhard Bonigl Date: Sun, 21 Sep 2014 18:39:30 +0200 Subject: [PATCH] Fix default texture being hardcoded to tinkers resources --- .../items/broadsword/copper_sword_blade.png.bla | Bin 105 -> 0 bytes .../java/tconstruct/library/tools/ToolCore.java | 16 +++++++++++++++- 2 files changed, 15 insertions(+), 1 deletion(-) delete mode 100644 resources/assets/tinker/textures/items/broadsword/copper_sword_blade.png.bla 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 e08d9769f14e56cd8b83e7b865407a949e48ff08..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 105 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`2A(dCAr_~T6BL+TGK~JTCvGy? zpLO|ny_#!73G)Qg=8Q=^5?6iv&l)&Pd=}`C&cHBTG=`%=^;0HLFN3G6pUXO@geCxf CydJ#( 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)); } }