Anvilcraft/resonant-induction
2
1
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Increased laser charge up delay to 20ticks

Browse source
This commit is contained in:
Robert S 2014-05-05 17:41:13 -04:00
parent bace43ead9
commit ecf0ea78ac
3 changed files with 3 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
electrical/src/main/scala/resonantinduction/electrical/laser/gun/ItemMiningLaser.java
View file

@ -2,15 +2,12 @@ package resonantinduction.electrical.laser.gun;
import java.awt.Color; import java.awt.Color;
import java.util.HashMap; import java.util.HashMap;
import java.util.List;
import net.minecraft.block.Block; import net.minecraft.block.Block;
import net.minecraft.creativetab.CreativeTabs;
import net.minecraft.entity.Entity; import net.minecraft.entity.Entity;
import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.item.EnumAction; import net.minecraft.item.EnumAction;
import net.minecraft.item.ItemStack; import net.minecraft.item.ItemStack;
import net.minecraft.nbt.NBTTagCompound;
import net.minecraft.util.DamageSource; import net.minecraft.util.DamageSource;
import net.minecraft.util.EnumMovingObjectType; import net.minecraft.util.EnumMovingObjectType;
import net.minecraft.util.MathHelper; import net.minecraft.util.MathHelper;
@ -21,13 +18,10 @@ import net.minecraftforge.common.ForgeDirection;
import net.minecraftforge.common.MinecraftForge; import net.minecraftforge.common.MinecraftForge;
import resonantinduction.core.ResonantInduction; import resonantinduction.core.ResonantInduction;
import resonantinduction.core.prefab.items.ItemEnergyTool; import resonantinduction.core.prefab.items.ItemEnergyTool;
import universalelectricity.api.UniversalClass;
import universalelectricity.api.vector.IVector3; import universalelectricity.api.vector.IVector3;
import universalelectricity.api.vector.Vector3; import universalelectricity.api.vector.Vector3;
import calclavia.api.resonantinduction.electrical.LaserEvent; import calclavia.api.resonantinduction.electrical.LaserEvent;
import calclavia.lib.type.Pair; import calclavia.lib.type.Pair;
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
/** Stream laser mining tool, When held down it will slowly mine away at the block in front of it. /** Stream laser mining tool, When held down it will slowly mine away at the block in front of it.
* *
@ -93,7 +87,7 @@ public class ItemMiningLaser extends ItemEnergyTool
//TODO increase break time longer the laser has been running //TODO increase break time longer the laser has been running
//TODO match hardness of block for break time //TODO match hardness of block for break time
//TODO add audio //TODO add audio
if ((player.capabilities.isCreativeMode || discharge(stack, joulesPerTick, false) > joulesPerTick) && count > 5) if ((player.capabilities.isCreativeMode || discharge(stack, joulesPerTick, false) > joulesPerTick) && count > 20)
{ {
if(!player.capabilities.isCreativeMode) if(!player.capabilities.isCreativeMode)
discharge(stack, joulesPerTick, true); discharge(stack, joulesPerTick, true);

2
src/main/scala/resonantinduction/core/prefab/items/ItemEnergyTool.java
View file

@ -118,7 +118,7 @@ public class ItemEnergyTool extends ItemTool implements IEnergyItem, IVoltageIte
itemStack.getTagCompound().setLong("electricity", electricityStored); itemStack.getTagCompound().setLong("electricity", electricityStored);
} }
public long getTransfer(ItemStack itemStack) public long getEnergySpace(ItemStack itemStack)
{ {
return this.getEnergyCapacity(itemStack) - this.getEnergy(itemStack); return this.getEnergyCapacity(itemStack) - this.getEnergy(itemStack);
} }

3
src/main/scala/resonantinduction/core/prefab/items/ItemTool.java
View file

@ -7,7 +7,6 @@ import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.item.Item; import net.minecraft.item.Item;
import net.minecraft.item.ItemStack; import net.minecraft.item.ItemStack;
import net.minecraft.world.World; import net.minecraft.world.World;
import calclavia.components.tool.ToolMode;
import calclavia.lib.utility.LanguageUtility; import calclavia.lib.utility.LanguageUtility;
import calclavia.lib.utility.nbt.NBTUtility; import calclavia.lib.utility.nbt.NBTUtility;
import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.Side;
@ -69,7 +68,7 @@ public class ItemTool extends Item
setMode(itemStack, (getMode(itemStack) + 1) % toolModes.length); setMode(itemStack, (getMode(itemStack) + 1) % toolModes.length);
String modeKey = toolModes[getMode(itemStack)]; String modeKey = toolModes[getMode(itemStack)];
if (!world.isRemote && modeKey != null && !modeKey.isEmpty()) if (!world.isRemote && modeKey != null && !modeKey.isEmpty())
{ {
player.addChatMessage(LanguageUtility.getLocal("tool.mode.set") + LanguageUtility.getLocal(modeKey)); player.addChatMessage(LanguageUtility.getLocal("tool.mode.set") + LanguageUtility.getLocal(modeKey));
} }