mirror of
https://github.com/GTNewHorizons/EnderIO.git
synced 2026-11-19 19:59:58 +00:00
Merge pull request #3163 from HenryLoenwind/magnetPower
Prevent magnet from being used as battery by default
This commit is contained in:
commit
f66ccef5dc
2 files changed
+14
-2
No files matched your search
@@ -334,6 +334,7 @@ public final class Config {
|
||||
public static boolean magnetAllowInMainInventory = false;
|
||||
public static boolean magnetAllowInBaublesSlot = true;
|
||||
public static boolean magnetAllowDeactivatedInBaublesSlot = false;
|
||||
public static boolean magnetAllowPowerExtraction = false;
|
||||
public static String magnetBaublesType = "AMULET";
|
||||
|
||||
public static boolean useCombustionGenModel = false;
|
||||
@@ -1120,6 +1121,9 @@ public final class Config {
|
||||
magnetAllowDeactivatedInBaublesSlot = config.get(sectionMagnet.name, "magnetAllowDeactivatedInBaublesSlot", magnetAllowDeactivatedInBaublesSlot,
|
||||
"If true the magnet can be put into the 'amulet' Baubles slot even if switched off (requires Baubles to be installed and magnetAllowInBaublesSlot to be on)").getBoolean(magnetAllowDeactivatedInBaublesSlot);
|
||||
|
||||
magnetAllowPowerExtraction = config.get(sectionMagnet.name, "magnetAllowPowerExtraction", magnetAllowPowerExtraction,
|
||||
"If true the magnet can be used as a battery.").getBoolean(magnetAllowPowerExtraction);
|
||||
|
||||
magnetBaublesType = config.get(sectionMagnet.name, "magnetBaublesType", magnetBaublesType,
|
||||
"The BaublesType the magnet should be, 'AMULET', 'RING' or 'BELT' (requires Baubles to be installed and magnetAllowInBaublesSlot to be on)").getString();
|
||||
|
||||
|
||||
@@ -63,7 +63,7 @@ public class ItemMagnet extends ItemEnergyContainer implements IResourceTooltipP
|
||||
}
|
||||
|
||||
public static void drainPerSecondPower(ItemStack itemStack) {
|
||||
DarkSteelItems.itemMagnet.extractEnergy(itemStack, Config.magnetPowerUsePerSecondRF, false);
|
||||
DarkSteelItems.itemMagnet.extractEnergyInternal(itemStack, Config.magnetPowerUsePerSecondRF, false);
|
||||
}
|
||||
|
||||
static MagnetController controller = new MagnetController();
|
||||
@@ -137,8 +137,16 @@ public class ItemMagnet extends ItemEnergyContainer implements IResourceTooltipP
|
||||
|
||||
@Override
|
||||
public int extractEnergy(ItemStack container, int maxExtract, boolean simulate) {
|
||||
if (Config.magnetAllowPowerExtraction) {
|
||||
return extractEnergyInternal(container, maxExtract, simulate);
|
||||
} else {
|
||||
return 0;
|
||||
}
|
||||
}
|
||||
|
||||
public int extractEnergyInternal(ItemStack container, int maxExtract, boolean simulate) {
|
||||
int res = super.extractEnergy(container, maxExtract, simulate);
|
||||
if(res != 0 && !simulate) {
|
||||
if (res != 0 && !simulate) {
|
||||
updateDamage(container);
|
||||
}
|
||||
return res;
|
||||
|
||||
Reference in new issue
Block a user