diff --git a/src/main/java/mekanism/api/MekanismConfig.java b/src/main/java/mekanism/api/MekanismConfig.java index 9e410759f..4d35b9d62 100644 --- a/src/main/java/mekanism/api/MekanismConfig.java +++ b/src/main/java/mekanism/api/MekanismConfig.java @@ -81,6 +81,9 @@ public class MekanismConfig { public static boolean enablePersonalChestPocketAccess; public static boolean accurateHeavyWaterCapture; public static int heavyWaterChance; + public static int atomicDisassemblerPoweredDamage; + public static int atomicDisassemblerUnpoweredDamage; + public static int atomicDisassemblerAttackPowerCost; } public static class client { diff --git a/src/main/java/mekanism/common/CommonProxy.java b/src/main/java/mekanism/common/CommonProxy.java index ade9a544c..a50653e6b 100644 --- a/src/main/java/mekanism/common/CommonProxy.java +++ b/src/main/java/mekanism/common/CommonProxy.java @@ -312,6 +312,9 @@ public class CommonProxy implements IGuiProvider { mekce.digitalMinerMaxRadius = Mekanism.configurationce.get("mekce", "DigitalMinerMaxRadius", 32, "Select range from 1 to 64, we do not recommend going over 32", 1, 64).getInt(); mekce.enableSingleUseCardboxes = Mekanism.configurationce.get("mekce", "EnableSingleUseCardboxes", true, "This allows to force single use on cardboxes or not").getBoolean(); mekce.enablePersonalChestPocketAccess = Mekanism.configurationce.get("mekce", "enablePersonalChestPocketAccess", true, "This allows opening Personal Chests from your inventory without having to place them").getBoolean(); + mekce.atomicDisassemblerPoweredDamage = Mekanism.configurationce.get("mekce", "atomicDisassemblerPoweredDamage", 20, "Attack Damage of a powered Atomic Disassembler. Default is 20").getInt(); + mekce.atomicDisassemblerUnpoweredDamage = Mekanism.configurationce.get("mekce", "atomicDisassemblerUnpoweredDamage", 4, "Attack Damage of an unpowered Atomic Disassembler. Default is 4").getInt(); + mekce.atomicDisassemblerAttackPowerCost = Mekanism.configurationce.get("mekce", "atomicDisassemblerAttackPowerCost", 2000, "Energy cost of attacking entities with the Atomic Disassembler. Default is 2000").getInt(); mekce.IC2SinkTier = Mekanism.configurationce.get("mekce", "IC2SinkTier", 4, "Tier level for machines, we recommend setting it to tier 2 for ic2 classic", 1, 4).getInt(); mekce.IC2SourceTier = Mekanism.configurationce.get("mekce", "IC2SourceTier", 4, "Tier level for generators, we recommend setting it to tier 2 for ic2 classic", 1, 4).getInt(); diff --git a/src/main/java/mekanism/common/item/ItemAtomicDisassembler.java b/src/main/java/mekanism/common/item/ItemAtomicDisassembler.java index d99d13549..a50b0d3ab 100644 --- a/src/main/java/mekanism/common/item/ItemAtomicDisassembler.java +++ b/src/main/java/mekanism/common/item/ItemAtomicDisassembler.java @@ -9,6 +9,7 @@ import java.util.Set; import mekanism.api.Coord4D; import mekanism.api.EnumColor; import mekanism.api.MekanismConfig.general; +import mekanism.api.MekanismConfig.mekce; import mekanism.api.util.ListUtils; import mekanism.common.util.LangUtils; import mekanism.common.util.MekanismUtils; @@ -54,10 +55,10 @@ public class ItemAtomicDisassembler extends ItemEnergized { @Override public boolean hitEntity(ItemStack itemstack, EntityLivingBase hitEntity, EntityLivingBase player) { if(getEnergy(itemstack) > 0) { - hitEntity.attackEntityFrom(DamageSource.causePlayerDamage((EntityPlayer)player), 20); - setEnergy(itemstack, getEnergy(itemstack) - 2000); + hitEntity.attackEntityFrom(DamageSource.causePlayerDamage((EntityPlayer)player), mekce.atomicDisassemblerPoweredDamage); + setEnergy(itemstack, getEnergy(itemstack) - mekce.atomicDisassemblerAttackPowerCost); } else { - hitEntity.attackEntityFrom(DamageSource.causePlayerDamage((EntityPlayer)player), 4); + hitEntity.attackEntityFrom(DamageSource.causePlayerDamage((EntityPlayer)player), mekce.atomicDisassemblerUnpoweredDamage); } return false; } diff --git a/src/main/java/mekanism/common/network/PacketConfigSync.java b/src/main/java/mekanism/common/network/PacketConfigSync.java index 1ae643df1..a7759ac5c 100644 --- a/src/main/java/mekanism/common/network/PacketConfigSync.java +++ b/src/main/java/mekanism/common/network/PacketConfigSync.java @@ -85,6 +85,9 @@ public class PacketConfigSync implements IMessageHandler