mirror of
https://github.com/Thorfusion/Mekanism-Community-Edition.git
synced 2026-11-22 12:59:41 +00:00
Merge branch 'master' into development
Conflicts: src/main/java/mekanism/common/CommonProxy.java src/main/java/mekanism/common/Mekanism.java src/main/java/mekanism/common/item/ItemAtomicDisassembler.java src/main/java/mekanism/common/network/PacketConfigSync.java src/main/java/mekanism/generators/common/MekanismGenerators.java
This commit is contained in:
commit
b2e532964c
5 files changed
+19
-15
No files matched your search
@@ -8,9 +8,9 @@ import java.util.Set;
|
||||
|
||||
import mekanism.api.Coord4D;
|
||||
import mekanism.api.EnumColor;
|
||||
import mekanism.api.MekanismConfig.general;
|
||||
import mekanism.api.util.ListUtils;
|
||||
import mekanism.common.util.MekanismUtils;
|
||||
|
||||
import net.minecraft.block.Block;
|
||||
import net.minecraft.client.renderer.texture.IIconRegister;
|
||||
import net.minecraft.entity.EntityLivingBase;
|
||||
@@ -28,8 +28,7 @@ import cpw.mods.fml.common.eventhandler.Event.Result;
|
||||
|
||||
public class ItemAtomicDisassembler extends ItemEnergized
|
||||
{
|
||||
public double ENERGY_USAGE = 10;
|
||||
public double HOE_USAGE = 100;
|
||||
public double HOE_USAGE = 10 * general.DISASSEMBLER_USAGE;
|
||||
|
||||
public ItemAtomicDisassembler()
|
||||
{
|
||||
@@ -80,10 +79,10 @@ public class ItemAtomicDisassembler extends ItemEnergized
|
||||
{
|
||||
if(block.getBlockHardness(world, x, y, z) != 0.0D)
|
||||
{
|
||||
setEnergy(itemstack, getEnergy(itemstack) - (ENERGY_USAGE*getEfficiency(itemstack)));
|
||||
setEnergy(itemstack, getEnergy(itemstack) - (general.DISASSEMBLER_USAGE*getEfficiency(itemstack)));
|
||||
}
|
||||
else {
|
||||
setEnergy(itemstack, getEnergy(itemstack) - (ENERGY_USAGE*(getEfficiency(itemstack))/2));
|
||||
setEnergy(itemstack, getEnergy(itemstack) - (general.DISASSEMBLER_USAGE*(getEfficiency(itemstack))/2));
|
||||
}
|
||||
|
||||
return true;
|
||||
@@ -125,7 +124,7 @@ public class ItemAtomicDisassembler extends ItemEnergized
|
||||
|
||||
for(Coord4D coord : found)
|
||||
{
|
||||
if(coord.equals(orig) || getEnergy(itemstack) < (ENERGY_USAGE*getEfficiency(itemstack)))
|
||||
if(coord.equals(orig) || getEnergy(itemstack) < (general.DISASSEMBLER_USAGE*getEfficiency(itemstack)))
|
||||
{
|
||||
continue;
|
||||
}
|
||||
@@ -138,7 +137,7 @@ public class ItemAtomicDisassembler extends ItemEnergized
|
||||
block2.breakBlock(player.worldObj, coord.xCoord, coord.yCoord, coord.zCoord, block, meta);
|
||||
block2.dropBlockAsItem(player.worldObj, coord.xCoord, coord.yCoord, coord.zCoord, meta, 0);
|
||||
|
||||
setEnergy(itemstack, getEnergy(itemstack) - (ENERGY_USAGE*getEfficiency(itemstack)));
|
||||
setEnergy(itemstack, getEnergy(itemstack) - (general.DISASSEMBLER_USAGE*getEfficiency(itemstack)));
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
Reference in new issue
Block a user