Ellpeck/ActuallyAdditions
1
0
Fork 0
mirror of https://github.com/Ellpeck/ActuallyAdditions.git synced 2024-11-26 16:58:34 +01:00
Code Issues Projects Releases Wiki Activity

Changed some energy item values around

Browse source
This commit is contained in:
Ellpeck 2016-11-21 13:38:43 +01:00
parent dd7e522605
commit 309733f096
7 changed files with 13 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
src/main/java/de/ellpeck/actuallyadditions/mod/items/InitItems.java
View file

@ -238,11 +238,11 @@ public final class InitItems{
itemTeleStaff = new ItemTeleStaff("item_tele_staff"); itemTeleStaff = new ItemTeleStaff("item_tele_staff");
itemWingsOfTheBats = new ItemWingsOfTheBats("item_wings_of_the_bats"); itemWingsOfTheBats = new ItemWingsOfTheBats("item_wings_of_the_bats");
itemDrill = new ItemDrill("item_drill"); itemDrill = new ItemDrill("item_drill");
itemBattery = new ItemBattery("item_battery", 1000000, 5000); itemBattery = new ItemBattery("item_battery", 200000, 500);
itemBatteryDouble = new ItemBattery("item_battery_double", 2000000, 10000); itemBatteryDouble = new ItemBattery("item_battery_double", 350000, 1000);
itemBatteryTriple = new ItemBattery("item_battery_triple", 4000000, 15000); itemBatteryTriple = new ItemBattery("item_battery_triple", 600000, 2000);
itemBatteryQuadruple = new ItemBattery("item_battery_quadruple", 8000000, 20000); itemBatteryQuadruple = new ItemBattery("item_battery_quadruple", 1000000, 4000);
itemBatteryQuintuple = new ItemBattery("item_battery_quintuple", 16000000, 25000); itemBatteryQuintuple = new ItemBattery("item_battery_quintuple", 2000000, 8000);
itemDrillUpgradeSpeed = new ItemDrillUpgrade(ItemDrillUpgrade.UpgradeType.SPEED, "item_drill_upgrade_speed"); itemDrillUpgradeSpeed = new ItemDrillUpgrade(ItemDrillUpgrade.UpgradeType.SPEED, "item_drill_upgrade_speed");
itemDrillUpgradeSpeedII = new ItemDrillUpgrade(ItemDrillUpgrade.UpgradeType.SPEED_II, "item_drill_upgrade_speed_ii"); itemDrillUpgradeSpeedII = new ItemDrillUpgrade(ItemDrillUpgrade.UpgradeType.SPEED_II, "item_drill_upgrade_speed_ii");
itemDrillUpgradeSpeedIII = new ItemDrillUpgrade(ItemDrillUpgrade.UpgradeType.SPEED_III, "item_drill_upgrade_speed_iii"); itemDrillUpgradeSpeedIII = new ItemDrillUpgrade(ItemDrillUpgrade.UpgradeType.SPEED_III, "item_drill_upgrade_speed_iii");

2
src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemDrill.java
View file

@ -61,7 +61,7 @@ public class ItemDrill extends ItemEnergy{
private static final int ENERGY_USE = 100; private static final int ENERGY_USE = 100;
public ItemDrill(String name){ public ItemDrill(String name){
super(500000, 5000, name); super(250000, 1000, name);
this.setMaxDamage(0); this.setMaxDamage(0);
this.setHasSubtypes(true); this.setHasSubtypes(true);

2
src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemFillingWand.java
View file

@ -35,7 +35,7 @@ import java.util.List;
public class ItemFillingWand extends ItemEnergy{ public class ItemFillingWand extends ItemEnergy{
public ItemFillingWand(String name){ public ItemFillingWand(String name){
super(800000, 2000, name); super(500000, 1000, name);
} }
private static boolean removeFittingItem(IBlockState state, EntityPlayer player){ private static boolean removeFittingItem(IBlockState state, EntityPlayer player){

2
src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemGrowthRing.java
View file

@ -31,7 +31,7 @@ import java.util.List;
public class ItemGrowthRing extends ItemEnergy{ public class ItemGrowthRing extends ItemEnergy{
public ItemGrowthRing(String name){ public ItemGrowthRing(String name){
super(1000000, 5000, name); super(1000000, 2000, name);
} }
@Override @Override

4
src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemMagnetRing.java
View file

@ -25,7 +25,7 @@ import java.util.ArrayList;
public class ItemMagnetRing extends ItemEnergy{ public class ItemMagnetRing extends ItemEnergy{
public ItemMagnetRing(String name){ public ItemMagnetRing(String name){
super(3000000, 5000, name); super(200000, 1000, name);
} }
@Override @Override
@ -40,7 +40,7 @@ public class ItemMagnetRing extends ItemEnergy{
if(!items.isEmpty()){ if(!items.isEmpty()){
for(EntityItem item : items){ for(EntityItem item : items){
if(!item.isDead && !item.cannotPickup()){ if(!item.isDead && !item.cannotPickup()){
int energyForItem = 350*StackUtil.getStackSize(item.getEntityItem()); int energyForItem = 50*StackUtil.getStackSize(item.getEntityItem());
if(this.getEnergyStored(stack) >= energyForItem){ if(this.getEnergyStored(stack) >= energyForItem){
item.onCollideWithPlayer(player); item.onCollideWithPlayer(player);

2
src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemTeleStaff.java
View file

@ -28,7 +28,7 @@ import net.minecraft.world.World;
public class ItemTeleStaff extends ItemEnergy{ public class ItemTeleStaff extends ItemEnergy{
public ItemTeleStaff(String name){ public ItemTeleStaff(String name){
super(500000, 10000, name); super(250000, 1000, name);
} }
@Override @Override

4
src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemWaterRemovalRing.java
View file

@ -26,7 +26,7 @@ import net.minecraft.world.World;
public class ItemWaterRemovalRing extends ItemEnergy{ public class ItemWaterRemovalRing extends ItemEnergy{
public ItemWaterRemovalRing(String name){ public ItemWaterRemovalRing(String name){
super(1000000, 5000, name); super(800000, 1000, name);
} }
@Override @Override
@ -38,7 +38,7 @@ public class ItemWaterRemovalRing extends ItemEnergy{
EntityPlayer player = (EntityPlayer)entity; EntityPlayer player = (EntityPlayer)entity;
ItemStack equipped = player.getHeldItemMainhand(); ItemStack equipped = player.getHeldItemMainhand();
int energyUse = 350; int energyUse = 150;
if(StackUtil.isValid(equipped) && equipped == stack && this.getEnergyStored(stack) >= energyUse){ if(StackUtil.isValid(equipped) && equipped == stack && this.getEnergyStored(stack) >= energyUse){
//Setting everything to air //Setting everything to air