upstream/TinkersConstruct
1
0 Fork 0
mirror of https://github.com/GTNewHorizons/TinkersConstruct.git synced 2026-11-13 17:04:24 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into weaponry

Browse Source 
Conflicts:
	src/main/java/tconstruct/items/tools/Arrow.java
	src/main/java/tconstruct/tools/TinkerTools.java
This commit is contained in:
Bernhard Bonigl committed 2014-10-19 14:12:50 +02:00
2 parents 8db17b6b4a 14078c4092
commit f31e41447c
11 files changed
+85 -79
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

src/main/java/tconstruct/items/tools/Arrow.java
+6 -2
View File
@@ -10,6 +10,7 @@ import net.minecraft.util.StatCollector;
import net.minecraft.world.World;
import tconstruct.library.TConstructRegistry;
import tconstruct.library.crafting.ToolBuilder;
import tconstruct.library.tools.CustomMaterial;
import tconstruct.library.tools.FletchingMaterial;
import tconstruct.library.tools.ToolCore;
import tconstruct.weaponry.TinkerWeaponry;
@@ -47,8 +48,11 @@ public class Arrow extends ToolCore
@Override
protected int getDefaultColor(int renderPass, int materialID) {
// fletchling uses custom material
if(renderPass == 2)
return TConstructRegistry.getCustomMaterial(materialID, FletchingMaterial.class).color;
if(renderPass == 2) {
CustomMaterial mat = TConstructRegistry.getCustomMaterial(materialID, FletchingMaterial.class);
if(mat != null)
return mat.color;
}
return super.getDefaultColor(renderPass, materialID);
}