diff --git a/src/main/java/tconstruct/items/tools/Hatchet.java b/src/main/java/tconstruct/items/tools/Hatchet.java index 69918471..14b6d847 100644 --- a/src/main/java/tconstruct/items/tools/Hatchet.java +++ b/src/main/java/tconstruct/items/tools/Hatchet.java @@ -41,10 +41,7 @@ public class Hatchet extends HarvestTool return AbilityHelper.onBlockChanged(itemstack, world, block, x, y, z, player, random); } - static Material[] materials = { Material.wood, Material.leaves, Material.vine, Material.circuits, Material.cactus };// TODO find - // this//, - // Material.pumpkin - // }; + static Material[] materials = { Material.wood, Material.leaves, Material.vine, Material.circuits, Material.cactus, Material.gourd }; @Override public Item getHeadItem () diff --git a/src/main/java/tconstruct/items/tools/LumberAxe.java b/src/main/java/tconstruct/items/tools/LumberAxe.java index 0154fecc..69ebb503 100644 --- a/src/main/java/tconstruct/items/tools/LumberAxe.java +++ b/src/main/java/tconstruct/items/tools/LumberAxe.java @@ -64,8 +64,7 @@ public class LumberAxe extends HarvestTool return AbilityHelper.onBlockChanged(itemstack, world, block, x, y, z, player, random); } - static Material[] materials = { Material.wood, Material.vine, Material.circuits, Material.cactus };// TODO find this//, - // Material.pumpkin }; + static Material[] materials = { Material.wood, Material.vine, Material.circuits, Material.cactus, Material.gourd }; /* Lumber axe specific */ diff --git a/src/main/java/tconstruct/items/tools/Scythe.java b/src/main/java/tconstruct/items/tools/Scythe.java index 5baa2b45..3756b29b 100644 --- a/src/main/java/tconstruct/items/tools/Scythe.java +++ b/src/main/java/tconstruct/items/tools/Scythe.java @@ -44,9 +44,7 @@ public class Scythe extends Weapon return materials; } - static Material[] materials = new Material[] { Material.web, Material.cactus, Material.plants, Material.leaves, Material.vine };// TODO find this//, Material.pumpkin, - // Material.plants, Material.vine, - // Material.leaves }; + static Material[] materials = new Material[] { Material.web, Material.cactus, Material.plants, Material.leaves, Material.vine, Material.gourd }; @Override public Item getHeadItem () diff --git a/src/main/java/tconstruct/util/DamageSourceFireworkExplode.java b/src/main/java/tconstruct/util/DamageSourceFireworkExplode.java index 0422af01..36d58701 100644 --- a/src/main/java/tconstruct/util/DamageSourceFireworkExplode.java +++ b/src/main/java/tconstruct/util/DamageSourceFireworkExplode.java @@ -1,6 +1,7 @@ package tconstruct.util; import net.minecraft.entity.EntityLivingBase; +import net.minecraft.util.ChatComponentTranslation; import net.minecraft.util.DamageSource; import net.minecraft.util.IChatComponent; @@ -16,7 +17,7 @@ public class DamageSourceFireworkExplode extends DamageSource @Override public IChatComponent func_151519_b (EntityLivingBase par1EntityLivingBase) { - return super.func_151519_b(par1EntityLivingBase); + return new ChatComponentTranslation("death.attack.FireworkExplode", par1EntityLivingBase.func_145748_c_()); } } diff --git a/src/main/java/tconstruct/util/DamageSourceLandmine.java b/src/main/java/tconstruct/util/DamageSourceLandmine.java index a76dc0b0..eae39313 100644 --- a/src/main/java/tconstruct/util/DamageSourceLandmine.java +++ b/src/main/java/tconstruct/util/DamageSourceLandmine.java @@ -1,6 +1,7 @@ package tconstruct.util; import net.minecraft.entity.EntityLivingBase; +import net.minecraft.util.ChatComponentTranslation; import net.minecraft.util.DamageSource; import net.minecraft.util.IChatComponent; @@ -16,8 +17,6 @@ public class DamageSourceLandmine extends DamageSource @Override public IChatComponent func_151519_b (EntityLivingBase par1EntityLivingBase) { - // TODO getDeathMessage???? - return super.func_151519_b(par1EntityLivingBase); + return new ChatComponentTranslation("death.attack.Landmine", par1EntityLivingBase.func_145748_c_()); } - }