From e2f20373e60fecce2b40cf7653afd4c0f4390d72 Mon Sep 17 00:00:00 2001 From: Technus Date: Sat, 5 Nov 2016 14:59:25 +0100 Subject: [PATCH] Fix tiering --- .../java/emt/item/armor/boots/ItemNanoBootsTraveller.java | 5 +++++ .../java/emt/item/armor/boots/ItemQuantumBootsTraveller.java | 5 +++++ .../item/armor/chestplate/ItemInfusedQuantumChestplate.java | 5 +++++ src/main/java/emt/item/armor/goggles/ItemNanoGoggles.java | 5 +++++ src/main/java/emt/item/armor/goggles/ItemQuantumGoggles.java | 5 +++++ .../emt/item/armor/goggles/ItemSolarHelmetRevealing.java | 5 +++++ src/main/java/emt/item/armor/wings/ItemNanoWing.java | 2 +- src/main/java/emt/item/armor/wings/ItemQuantumWing.java | 4 ++++ src/main/java/emt/item/tool/ItemElectricHoeGrowth.java | 2 +- src/main/java/emt/item/tool/ItemElectricThorHammer.java | 2 +- 10 files changed, 37 insertions(+), 3 deletions(-) diff --git a/src/main/java/emt/item/armor/boots/ItemNanoBootsTraveller.java b/src/main/java/emt/item/armor/boots/ItemNanoBootsTraveller.java index 8d19f8f..f31d2ec 100644 --- a/src/main/java/emt/item/armor/boots/ItemNanoBootsTraveller.java +++ b/src/main/java/emt/item/armor/boots/ItemNanoBootsTraveller.java @@ -25,6 +25,11 @@ public class ItemNanoBootsTraveller extends ItemElectricBootsTraveller { return 0.9D; } + @Override + public int getTier(ItemStack itemStack) { + return 3; + } + @SideOnly(Side.CLIENT) @Override public void registerIcons(IIconRegister iconRegister) { diff --git a/src/main/java/emt/item/armor/boots/ItemQuantumBootsTraveller.java b/src/main/java/emt/item/armor/boots/ItemQuantumBootsTraveller.java index 1229345..f5159f5 100644 --- a/src/main/java/emt/item/armor/boots/ItemQuantumBootsTraveller.java +++ b/src/main/java/emt/item/armor/boots/ItemQuantumBootsTraveller.java @@ -25,6 +25,11 @@ public class ItemQuantumBootsTraveller extends ItemElectricBootsTraveller { return 1D; } + @Override + public int getTier(ItemStack itemStack) { + return 4; + } + @SideOnly(Side.CLIENT) @Override public void registerIcons(IIconRegister iconRegister) { diff --git a/src/main/java/emt/item/armor/chestplate/ItemInfusedQuantumChestplate.java b/src/main/java/emt/item/armor/chestplate/ItemInfusedQuantumChestplate.java index e36ec89..7976050 100644 --- a/src/main/java/emt/item/armor/chestplate/ItemInfusedQuantumChestplate.java +++ b/src/main/java/emt/item/armor/chestplate/ItemInfusedQuantumChestplate.java @@ -404,6 +404,11 @@ public class ItemInfusedQuantumChestplate extends ItemArmorElectric { } } + @Override + public int getTier(ItemStack itemStack) { + return 4; + } + @Override @SideOnly(Side.CLIENT) public ModelBiped getArmorModel(EntityLivingBase entity, ItemStack stack, int armorSlot) { diff --git a/src/main/java/emt/item/armor/goggles/ItemNanoGoggles.java b/src/main/java/emt/item/armor/goggles/ItemNanoGoggles.java index e7df483..43c03b9 100644 --- a/src/main/java/emt/item/armor/goggles/ItemNanoGoggles.java +++ b/src/main/java/emt/item/armor/goggles/ItemNanoGoggles.java @@ -45,6 +45,11 @@ public class ItemNanoGoggles extends ItemElectricGoggles { return 0.9D; } + @Override + public int getTier(ItemStack itemStack) { + return 3; + } + @Override public void onArmorTick(World world, EntityPlayer player, ItemStack itemStack) { if (EMTConfigHandler.nightVisionOff == false) { diff --git a/src/main/java/emt/item/armor/goggles/ItemQuantumGoggles.java b/src/main/java/emt/item/armor/goggles/ItemQuantumGoggles.java index 3e7bf38..03fe2e1 100644 --- a/src/main/java/emt/item/armor/goggles/ItemQuantumGoggles.java +++ b/src/main/java/emt/item/armor/goggles/ItemQuantumGoggles.java @@ -57,6 +57,11 @@ public class ItemQuantumGoggles extends ItemNanoGoggles { return 1D; } + @Override + public int getTier(ItemStack itemStack) { + return 4; + } + @Override public void onArmorTick(World world, EntityPlayer player, ItemStack itemStack) { int refill = player.getAir(); diff --git a/src/main/java/emt/item/armor/goggles/ItemSolarHelmetRevealing.java b/src/main/java/emt/item/armor/goggles/ItemSolarHelmetRevealing.java index a66205b..9f66c25 100644 --- a/src/main/java/emt/item/armor/goggles/ItemSolarHelmetRevealing.java +++ b/src/main/java/emt/item/armor/goggles/ItemSolarHelmetRevealing.java @@ -71,6 +71,11 @@ public class ItemSolarHelmetRevealing extends ItemQuantumGoggles { return 1D; } + @Override + public int getTier(ItemStack itemStack) { + return 4; + } + @SuppressWarnings("unchecked") @Override public void onArmorTick(World worldObj, EntityPlayer player, ItemStack itemStack) { diff --git a/src/main/java/emt/item/armor/wings/ItemNanoWing.java b/src/main/java/emt/item/armor/wings/ItemNanoWing.java index 75cf892..2ccbdee 100644 --- a/src/main/java/emt/item/armor/wings/ItemNanoWing.java +++ b/src/main/java/emt/item/armor/wings/ItemNanoWing.java @@ -157,7 +157,7 @@ public class ItemNanoWing extends ItemThaumiumReinforcedWing implements IElectri @Override public int getTier(ItemStack itemStack) { - return 2; + return 3; } @Override diff --git a/src/main/java/emt/item/armor/wings/ItemQuantumWing.java b/src/main/java/emt/item/armor/wings/ItemQuantumWing.java index c7e51cd..c5457c7 100644 --- a/src/main/java/emt/item/armor/wings/ItemQuantumWing.java +++ b/src/main/java/emt/item/armor/wings/ItemQuantumWing.java @@ -55,6 +55,10 @@ public class ItemQuantumWing extends ItemNanoWing { return maxCharge; } + @Override + public int getTier(ItemStack itemStack) { + return 4; + } public double getDamageAbsorptionRatio() { return 1D; diff --git a/src/main/java/emt/item/tool/ItemElectricHoeGrowth.java b/src/main/java/emt/item/tool/ItemElectricHoeGrowth.java index 35eb7ec..7faad0d 100644 --- a/src/main/java/emt/item/tool/ItemElectricHoeGrowth.java +++ b/src/main/java/emt/item/tool/ItemElectricHoeGrowth.java @@ -126,7 +126,7 @@ public class ItemElectricHoeGrowth extends ItemHoe implements IElectricItem { @Override public int getTier(ItemStack itemStack) { - return 1; + return 2; } @Override diff --git a/src/main/java/emt/item/tool/ItemElectricThorHammer.java b/src/main/java/emt/item/tool/ItemElectricThorHammer.java index 38248f1..bfc63ec 100644 --- a/src/main/java/emt/item/tool/ItemElectricThorHammer.java +++ b/src/main/java/emt/item/tool/ItemElectricThorHammer.java @@ -180,7 +180,7 @@ public class ItemElectricThorHammer extends ItemSword implements IElectricItem { @Override public int getTier(ItemStack itemStack) { - return 2; + return 4; } @Override