From 434ee0cbc35f3fe8fbda22f147571c60a7b21799 Mon Sep 17 00:00:00 2001 From: Robert S Date: Tue, 6 May 2014 02:03:16 -0400 Subject: [PATCH] Laser gun consumes less energy per mode its in --- .../electrical/laser/gun/ItemMiningLaser.java | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-) diff --git a/electrical/src/main/scala/resonantinduction/electrical/laser/gun/ItemMiningLaser.java b/electrical/src/main/scala/resonantinduction/electrical/laser/gun/ItemMiningLaser.java index 0e40e6f2a..45fd8e4a2 100644 --- a/electrical/src/main/scala/resonantinduction/electrical/laser/gun/ItemMiningLaser.java +++ b/electrical/src/main/scala/resonantinduction/electrical/laser/gun/ItemMiningLaser.java @@ -54,7 +54,7 @@ public class ItemMiningLaser extends ItemEnergyTool HashMap energyUsedMap = new HashMap(); public static final int MODE_REMOVE = 0, MODE_SMELT = 1, MODE_DAMAGE = 2; - + public ItemMiningLaser(int id) { super(id); @@ -99,7 +99,16 @@ public class ItemMiningLaser extends ItemEnergyTool if (!player.capabilities.isCreativeMode) { long energyUsed = this.energyUsedMap.containsKey(player) ? this.energyUsedMap.get(player) : 0; - energyUsed += joulesPerTick; + + switch (getMode(stack)) + { + case 0: + energyUsed += joulesPerTick; + case 1: + energyUsed += joulesPerTick / 2; + case 2: + energyUsed += joulesPerTick / 3; + } this.energyUsedMap.put(player, energyUsed); } @@ -135,7 +144,7 @@ public class ItemMiningLaser extends ItemEnergyTool mined = true; miningMap.remove(player); } - else if(this.getMode(stack) == MODE_REMOVE || this.getMode(stack) == MODE_SMELT) + else if (this.getMode(stack) == MODE_REMOVE || this.getMode(stack) == MODE_SMELT) { //TODO get the actual hit side from the angle of the ray trace LaserEvent.onLaserHitBlock(player.worldObj, player, new Vector3(hit), ForgeDirection.UP);