Fixed more misc. bugs

SlimeKnights · Feb 21, 2014 · f217267 · f217267
1 parent edc97ef
commit f217267
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 3 deletions.
diff --git a/resources/assets/tinker/lang/en_US.lang b/resources/assets/tinker/lang/en_US.lang
@@ -135,6 +135,8 @@ item.oreberry.essence.name=Concentrated Essence Berry
 item.goldenhead.name=Golden Head
 item.tconstruct.titleicon.name=Spawn
 
+tile.tconstruct.meatblock.name=Hambone
+
 item.InfiTool.Pickaxe.name=Pickaxe
 item.InfiTool.Shovel.name=Shovel
 item.InfiTool.Axe.name=Hatchet
@@ -385,6 +387,7 @@ block.slime.grass.dirt.name=Slimy Grass
 block.slime.tallgrass.name=Slimy Grass
 block.slime.congealed.blue.name=Congealed Blue Slime
 block.slime.congealed.green.name=Congealed Green Slime
+block.slime.congealed.purple.name=Congealed Purple Slime
 
 item.tconstruct.storage.knapsack.name=Knapsack  
 item.tconstruct.blankpattern.pattern.name=Blank Pattern

diff --git a/src/main/java/tconstruct/items/tools/Mattock.java b/src/main/java/tconstruct/items/tools/Mattock.java
@@ -47,7 +47,7 @@ protected String getSecondHarvestType ()
         return "shovel";
     }
 
-    static Material[] axeMaterials = { Material.wood, Material.cactus };// TODO
+    static Material[] axeMaterials = { Material.wood, Material.cactus, Material.plants, Material.vine };// TODO
                                                                         // find
                                                                         // this//,
                                                                         // Material.pumpkin,

diff --git a/src/main/java/tconstruct/library/tools/DualHarvestTool.java b/src/main/java/tconstruct/library/tools/DualHarvestTool.java
@@ -31,9 +31,9 @@ public boolean onBlockStartBreak (ItemStack stack, int x, int y, int z, EntityPl
             return false;
         int hlvl = -1;
         int shlvl = -1;
-        if (block.getHarvestTool(meta).equals(getHarvestType()))
+        if (block.getHarvestTool(meta) == null || block.getHarvestTool(meta).equals(getHarvestType()))
             hlvl = block.getHarvestLevel(meta);
-        if (block.getHarvestTool(meta).equals(getSecondHarvestType()))
+        if (block.getHarvestTool(meta) == null || block.getHarvestTool(meta).equals(getSecondHarvestType()))
             shlvl = block.getHarvestLevel(meta);
 
         if (hlvl <= tags.getInteger("HarvestLevel") && shlvl <= tags.getInteger("HarvestLevel2"))