From 309733f09614fda538b02ab186dc1557f0693c51 Mon Sep 17 00:00:00 2001 From: Ellpeck Date: Mon, 21 Nov 2016 13:38:43 +0100 Subject: [PATCH] Changed some energy item values around --- .../ellpeck/actuallyadditions/mod/items/InitItems.java | 10 +++++----- .../ellpeck/actuallyadditions/mod/items/ItemDrill.java | 2 +- .../actuallyadditions/mod/items/ItemFillingWand.java | 2 +- .../actuallyadditions/mod/items/ItemGrowthRing.java | 2 +- .../actuallyadditions/mod/items/ItemMagnetRing.java | 4 ++-- .../actuallyadditions/mod/items/ItemTeleStaff.java | 2 +- .../mod/items/ItemWaterRemovalRing.java | 4 ++-- 7 files changed, 13 insertions(+), 13 deletions(-) diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/items/InitItems.java b/src/main/java/de/ellpeck/actuallyadditions/mod/items/InitItems.java index 59d93e81e..f01f55e69 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/items/InitItems.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/items/InitItems.java @@ -238,11 +238,11 @@ public final class InitItems{ itemTeleStaff = new ItemTeleStaff("item_tele_staff"); itemWingsOfTheBats = new ItemWingsOfTheBats("item_wings_of_the_bats"); itemDrill = new ItemDrill("item_drill"); - itemBattery = new ItemBattery("item_battery", 1000000, 5000); - itemBatteryDouble = new ItemBattery("item_battery_double", 2000000, 10000); - itemBatteryTriple = new ItemBattery("item_battery_triple", 4000000, 15000); - itemBatteryQuadruple = new ItemBattery("item_battery_quadruple", 8000000, 20000); - itemBatteryQuintuple = new ItemBattery("item_battery_quintuple", 16000000, 25000); + itemBattery = new ItemBattery("item_battery", 200000, 500); + itemBatteryDouble = new ItemBattery("item_battery_double", 350000, 1000); + itemBatteryTriple = new ItemBattery("item_battery_triple", 600000, 2000); + itemBatteryQuadruple = new ItemBattery("item_battery_quadruple", 1000000, 4000); + itemBatteryQuintuple = new ItemBattery("item_battery_quintuple", 2000000, 8000); itemDrillUpgradeSpeed = new ItemDrillUpgrade(ItemDrillUpgrade.UpgradeType.SPEED, "item_drill_upgrade_speed"); itemDrillUpgradeSpeedII = new ItemDrillUpgrade(ItemDrillUpgrade.UpgradeType.SPEED_II, "item_drill_upgrade_speed_ii"); itemDrillUpgradeSpeedIII = new ItemDrillUpgrade(ItemDrillUpgrade.UpgradeType.SPEED_III, "item_drill_upgrade_speed_iii"); diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemDrill.java b/src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemDrill.java index 88102c8e2..79e37ff74 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemDrill.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemDrill.java @@ -61,7 +61,7 @@ public class ItemDrill extends ItemEnergy{ private static final int ENERGY_USE = 100; public ItemDrill(String name){ - super(500000, 5000, name); + super(250000, 1000, name); this.setMaxDamage(0); this.setHasSubtypes(true); diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemFillingWand.java b/src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemFillingWand.java index c0eab6c9f..c508b5d26 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemFillingWand.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemFillingWand.java @@ -35,7 +35,7 @@ import java.util.List; public class ItemFillingWand extends ItemEnergy{ public ItemFillingWand(String name){ - super(800000, 2000, name); + super(500000, 1000, name); } private static boolean removeFittingItem(IBlockState state, EntityPlayer player){ diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemGrowthRing.java b/src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemGrowthRing.java index a4d8515df..af89c268f 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemGrowthRing.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemGrowthRing.java @@ -31,7 +31,7 @@ import java.util.List; public class ItemGrowthRing extends ItemEnergy{ public ItemGrowthRing(String name){ - super(1000000, 5000, name); + super(1000000, 2000, name); } @Override diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemMagnetRing.java b/src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemMagnetRing.java index ea9cb3f76..f0c41e42c 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemMagnetRing.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemMagnetRing.java @@ -25,7 +25,7 @@ import java.util.ArrayList; public class ItemMagnetRing extends ItemEnergy{ public ItemMagnetRing(String name){ - super(3000000, 5000, name); + super(200000, 1000, name); } @Override @@ -40,7 +40,7 @@ public class ItemMagnetRing extends ItemEnergy{ if(!items.isEmpty()){ for(EntityItem item : items){ if(!item.isDead && !item.cannotPickup()){ - int energyForItem = 350*StackUtil.getStackSize(item.getEntityItem()); + int energyForItem = 50*StackUtil.getStackSize(item.getEntityItem()); if(this.getEnergyStored(stack) >= energyForItem){ item.onCollideWithPlayer(player); diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemTeleStaff.java b/src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemTeleStaff.java index 9f8a2ed19..83cd4e88a 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemTeleStaff.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemTeleStaff.java @@ -28,7 +28,7 @@ import net.minecraft.world.World; public class ItemTeleStaff extends ItemEnergy{ public ItemTeleStaff(String name){ - super(500000, 10000, name); + super(250000, 1000, name); } @Override diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemWaterRemovalRing.java b/src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemWaterRemovalRing.java index d4e866160..7fbe062bf 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemWaterRemovalRing.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemWaterRemovalRing.java @@ -26,7 +26,7 @@ import net.minecraft.world.World; public class ItemWaterRemovalRing extends ItemEnergy{ public ItemWaterRemovalRing(String name){ - super(1000000, 5000, name); + super(800000, 1000, name); } @Override @@ -38,7 +38,7 @@ public class ItemWaterRemovalRing extends ItemEnergy{ EntityPlayer player = (EntityPlayer)entity; ItemStack equipped = player.getHeldItemMainhand(); - int energyUse = 350; + int energyUse = 150; if(StackUtil.isValid(equipped) && equipped == stack && this.getEnergyStored(stack) >= energyUse){ //Setting everything to air