lauchmelder/BloodMagic
1
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/WayofTime/BloodMagic

Browse source
This commit is contained in:
Arcaratus 2015-07-27 11:52:27 -04:00
parent 1ed939b700 79f86a3a37
commit e2db60475f
2 changed files with 28 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
build.properties
View file

@ -1,5 +1,5 @@
#
#Sun Jul 19 14:39:17 EDT 2015
#Mon Jul 20 20:59:46 EDT 2015
mod_name=BloodMagic
forge_version=10.13.4.1448-1.7.10
ccc_version=1.0.4.29
@ -9,5 +9,5 @@ guideapi_version=1.0.1-20
package_group=com.wayoftime.bloodmagic
mod_version=1.3.3
minetweaker_version=Dev-1.7.10-3.0.9B
build_number=12
mc_version=1.7.10
build_number=11

25
src/main/java/WayofTime/alchemicalWizardry/api/items/ItemSpellMultiTool.java
View file

@ -284,9 +284,14 @@ public class ItemSpellMultiTool extends Item
String toolClass = block.getHarvestTool(meta);
if (toolClass == null || toolClass.equals(""))
{
toolClass = getToolClassOfMaterial(block.getMaterial());
if(toolClass == "")
{
return 1.0f;
}
}
{
if (stack.hasTagCompound())
{
@ -302,6 +307,26 @@ public class ItemSpellMultiTool extends Item
return 1.0f;
}
public String getToolClassOfMaterial(Material mat)
{
if(mat == Material.iron || mat == Material.anvil || mat == Material.rock)
{
return "pickaxe";
}
if(mat == Material.wood || mat == Material.plants || mat == Material.vine)
{
return "axe";
}
if(mat == Material.ground || mat == Material.grass)
{
return "shovel";
}
return "";
}
@Override
public int getHarvestLevel(ItemStack stack, String toolClass)
{