From 2f03b20bead7e770e8ff19395bbbacb7910e8b6a Mon Sep 17 00:00:00 2001 From: TheDoctorSoda Date: Thu, 25 Feb 2016 19:01:02 -0800 Subject: [PATCH] Fix chainsaws extending Pickaxe not Axe --- .../techreborn/items/tools/ItemAdvancedChainsaw.java | 2 +- .../java/techreborn/items/tools/ItemDiamondChainsaw.java | 9 +++++---- src/main/resources/assets/techreborn/lang/en_US.lang | 6 ++++-- 3 files changed, 10 insertions(+), 7 deletions(-) diff --git a/src/main/java/techreborn/items/tools/ItemAdvancedChainsaw.java b/src/main/java/techreborn/items/tools/ItemAdvancedChainsaw.java index 41c3bb254..fd0c33fc9 100644 --- a/src/main/java/techreborn/items/tools/ItemAdvancedChainsaw.java +++ b/src/main/java/techreborn/items/tools/ItemAdvancedChainsaw.java @@ -24,7 +24,7 @@ import techreborn.config.ConfigTechReborn; import java.util.List; -public class ItemAdvancedChainsaw extends ItemPickaxe implements IEnergyItemInfo, ITexturedItem { +public class ItemAdvancedChainsaw extends ItemAxe implements IEnergyItemInfo, ITexturedItem { public int maxCharge = ConfigTechReborn.AdvancedChainsawCharge; public int cost = 250; diff --git a/src/main/java/techreborn/items/tools/ItemDiamondChainsaw.java b/src/main/java/techreborn/items/tools/ItemDiamondChainsaw.java index caf779106..e58e0df51 100644 --- a/src/main/java/techreborn/items/tools/ItemDiamondChainsaw.java +++ b/src/main/java/techreborn/items/tools/ItemDiamondChainsaw.java @@ -1,5 +1,7 @@ package techreborn.items.tools; +import java.util.List; + import me.modmuss50.jsonDestroyer.api.ITexturedItem; import net.minecraft.block.Block; import net.minecraft.block.state.IBlockState; @@ -8,7 +10,8 @@ import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.init.Items; import net.minecraft.item.Item; -import net.minecraft.item.ItemPickaxe; +import net.minecraft.item.Item.ToolMaterial; +import net.minecraft.item.ItemAxe; import net.minecraft.item.ItemStack; import net.minecraft.util.BlockPos; import net.minecraft.util.EnumFacing; @@ -22,9 +25,7 @@ import reborncore.common.util.TorchHelper; import techreborn.client.TechRebornCreativeTab; import techreborn.config.ConfigTechReborn; -import java.util.List; - -public class ItemDiamondChainsaw extends ItemPickaxe implements IEnergyItemInfo, ITexturedItem { +public class ItemDiamondChainsaw extends ItemAxe implements IEnergyItemInfo, ITexturedItem { public int maxCharge = ConfigTechReborn.DiamondChainsawCharge; public int cost = 250; diff --git a/src/main/resources/assets/techreborn/lang/en_US.lang b/src/main/resources/assets/techreborn/lang/en_US.lang index 23ce919ee..e2e5213cb 100644 --- a/src/main/resources/assets/techreborn/lang/en_US.lang +++ b/src/main/resources/assets/techreborn/lang/en_US.lang @@ -75,7 +75,6 @@ tile.techreborn.rubberleaves.name=Rubber Leaves tile.techreborn.rubbersapling.name=Rubber Sapling tile.techreborn.ironfence.name=Iron Fence -tile.techreborn.ironfencegate.name=Iron Fence Gate #Ores tile.techreborn.ore.Galena.name=Galena Ore @@ -601,10 +600,13 @@ item.techreborn.part.hvTransformer.name=HV Transformer item.techreborn.rockcutter.name=Rockcutter item.techreborn.lithiumbatpack.name=Lithium Batpack item.techreborn.lapotronpack.name=Lapotron Pack -item.techreborn.omniTool.name=Omni tool +item.techreborn.omniTool.name=Omni-Tool item.techreborn.ironDrill.name=Iron Drill item.techreborn.diamondDrill.name=Diamond Drill item.techreborn.advancedDrill.name=Advanced Drill +item.techreborn.ironChainsaw.name=Iron Chainsaw +item.techreborn.diamondChainsaw.name=Diamond Chainsaw +item.techreborn.advancedChainsaw.name=Advanced Chainsaw item.techreborn.lapotronicorb.name=Lapotronic Energy Orb item.techreborn.cloakingdevice.name=Cloaking Device item.techreborn.hammer.name=Iron Hammer