From d4ec5b5ec35a41d73f231f9bae3e299c99506466 Mon Sep 17 00:00:00 2001 From: Technus Date: Sat, 5 Nov 2016 15:51:46 +0100 Subject: [PATCH] Unify to other armors --- src/main/java/emt/init/EMTItems.java | 6 +++--- .../emt/item/armor/boots/ItemElectricBootsTraveller.java | 6 +++--- .../java/emt/item/armor/boots/ItemNanoBootsTraveller.java | 4 ++-- .../emt/item/armor/boots/ItemQuantumBootsTraveller.java | 4 ++-- 4 files changed, 10 insertions(+), 10 deletions(-) diff --git a/src/main/java/emt/init/EMTItems.java b/src/main/java/emt/init/EMTItems.java index ac01af0..f938840 100644 --- a/src/main/java/emt/init/EMTItems.java +++ b/src/main/java/emt/init/EMTItems.java @@ -113,13 +113,13 @@ public class EMTItems { solarHelmetRevealing = new ItemSolarHelmetRevealing(ItemArmor.ArmorMaterial.DIAMOND, 3, 0).setUnlocalizedName(EMT.MOD_ID + ".goggles.solar"); GameRegistry.registerItem(solarHelmetRevealing, "SolarHelmetRevealing"); - electricBootsTraveller = new ItemElectricBootsTraveller(3, 3).setUnlocalizedName(EMT.MOD_ID + ".boots.traveller.electric"); + electricBootsTraveller = new ItemElectricBootsTraveller(ItemArmor.ArmorMaterial.IRON, 3, 3).setUnlocalizedName(EMT.MOD_ID + ".boots.traveller.electric"); GameRegistry.registerItem(electricBootsTraveller, "ElectricBootsTraveller"); - nanoBootsTraveller = new ItemNanoBootsTraveller(3, 3).setUnlocalizedName(EMT.MOD_ID + ".boots.traveller.nano"); + nanoBootsTraveller = new ItemNanoBootsTraveller(ItemArmor.ArmorMaterial.DIAMOND, 3, 3).setUnlocalizedName(EMT.MOD_ID + ".boots.traveller.nano"); GameRegistry.registerItem(nanoBootsTraveller, "NanoBootsTraveller"); - quantumBootsTraveller = new ItemQuantumBootsTraveller(3, 3).setUnlocalizedName(EMT.MOD_ID + ".boots.traveller.quantum"); + quantumBootsTraveller = new ItemQuantumBootsTraveller(ItemArmor.ArmorMaterial.DIAMOND, 3, 3).setUnlocalizedName(EMT.MOD_ID + ".boots.traveller.quantum"); GameRegistry.registerItem(quantumBootsTraveller, "QuantumBootsTraveller"); electricScribingTools = new ItemElectricScribingTools().setUnlocalizedName(EMT.MOD_ID + ".scribingtools.electric"); diff --git a/src/main/java/emt/item/armor/boots/ItemElectricBootsTraveller.java b/src/main/java/emt/item/armor/boots/ItemElectricBootsTraveller.java index 5a98e98..d837ac3 100644 --- a/src/main/java/emt/item/armor/boots/ItemElectricBootsTraveller.java +++ b/src/main/java/emt/item/armor/boots/ItemElectricBootsTraveller.java @@ -41,8 +41,8 @@ public class ItemElectricBootsTraveller extends ItemArmor implements IElectricIt public double transferLimit = 100; public boolean speedBoostActive = false; - public ItemElectricBootsTraveller(int par3, int par4) { - super(ArmorMaterial.DIAMOND, par3, par4); + public ItemElectricBootsTraveller(ArmorMaterial material, int par3, int par4) { + super(material, par3, par4); this.setMaxDamage(27); this.setMaxStackSize(1); this.setCreativeTab(EMT.TAB); @@ -71,7 +71,7 @@ public class ItemElectricBootsTraveller extends ItemArmor implements IElectricIt @Override public ArmorProperties getProperties(EntityLivingBase player, ItemStack armor, DamageSource source, double damage, int slot) { if (source.isUnblockable()) { - return new net.minecraftforge.common.ISpecialArmor.ArmorProperties(0, 0.0D, 3); + return new net.minecraftforge.common.ISpecialArmor.ArmorProperties(0, 0.0D, 0); } else { double absorptionRatio = getBaseAbsorptionRatio() * getDamageAbsorptionRatio(); diff --git a/src/main/java/emt/item/armor/boots/ItemNanoBootsTraveller.java b/src/main/java/emt/item/armor/boots/ItemNanoBootsTraveller.java index f31d2ec..435b891 100644 --- a/src/main/java/emt/item/armor/boots/ItemNanoBootsTraveller.java +++ b/src/main/java/emt/item/armor/boots/ItemNanoBootsTraveller.java @@ -10,8 +10,8 @@ import net.minecraft.item.ItemStack; public class ItemNanoBootsTraveller extends ItemElectricBootsTraveller { - public ItemNanoBootsTraveller(int par3, int par4) { - super(par3, par4); + public ItemNanoBootsTraveller(ArmorMaterial material, int par3, int par4) { + super(material, par3, par4); maxCharge = 1000000; speedBonus = (float) EMTConfigHandler.nanoBootsSpeed; jumpBonus = (float) EMTConfigHandler.nanoBootsJump; diff --git a/src/main/java/emt/item/armor/boots/ItemQuantumBootsTraveller.java b/src/main/java/emt/item/armor/boots/ItemQuantumBootsTraveller.java index f5159f5..c709c96 100644 --- a/src/main/java/emt/item/armor/boots/ItemQuantumBootsTraveller.java +++ b/src/main/java/emt/item/armor/boots/ItemQuantumBootsTraveller.java @@ -10,8 +10,8 @@ import net.minecraft.item.ItemStack; public class ItemQuantumBootsTraveller extends ItemElectricBootsTraveller { - public ItemQuantumBootsTraveller(int par3, int par4) { - super(par3, par4); + public ItemQuantumBootsTraveller(ArmorMaterial material, int par3, int par4) { + super(material, par3, par4); maxCharge = 10000000; speedBonus = (float) EMTConfigHandler.quantumBootsSpeed; jumpBonus = (float) EMTConfigHandler.quantumBootsJump;