From 9fa3d5d6456d14349b77a7dec497cf29a2aed238 Mon Sep 17 00:00:00 2001 From: tterrag1098 Date: Fri, 2 Jan 2015 01:33:59 -0500 Subject: [PATCH] Allow dark steel armor to charge other mods' armors --- src/main/java/crazypants/enderio/config/Config.java | 3 +++ .../crazypants/enderio/item/darksteel/DarkSteelController.java | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/src/main/java/crazypants/enderio/config/Config.java b/src/main/java/crazypants/enderio/config/Config.java index 834995af..b8886c94 100644 --- a/src/main/java/crazypants/enderio/config/Config.java +++ b/src/main/java/crazypants/enderio/config/Config.java @@ -226,6 +226,7 @@ public final class Config { public static int darkSteelSolarOneCost = 15; public static int darkSteelSolarTwoGen = 40; public static int darkSteelSolarTwoCost = 30; + public static boolean darkSteelSolarChargeOthers = true; public static float darkSteelAnvilDamageChance = 0.024f; @@ -794,6 +795,8 @@ public final class Config { "Cost in XP levels of the Solar II upgrade.").getInt(); darkSteelSolarTwoGen = config.get(sectionDarkSteel.name, "darkSteelSolarTwoGen", darkSteelSolarTwoGen, "RF per SECOND generated by the Solar II upgrade. Split between all equipped DS armors.").getInt(); + darkSteelSolarChargeOthers = config.get(sectionDarkSteel.name, "darkSteelSolarChargeOthers", darkSteelSolarChargeOthers, + "If enabled allows the solar upgrade to charge non-darksteel armors that the player is wearing.").getBoolean(); darkSteelSwordSkullChance = (float) config.get(sectionDarkSteel.name, "darkSteelSwordSkullChance", darkSteelSwordSkullChance, "The base chance that a skull will be dropped when using a powered dark steel sword (0 = no chance, 1 = 100% chance)").getDouble( diff --git a/src/main/java/crazypants/enderio/item/darksteel/DarkSteelController.java b/src/main/java/crazypants/enderio/item/darksteel/DarkSteelController.java index eba39f07..6eddf818 100644 --- a/src/main/java/crazypants/enderio/item/darksteel/DarkSteelController.java +++ b/src/main/java/crazypants/enderio/item/darksteel/DarkSteelController.java @@ -156,7 +156,7 @@ public class DarkSteelController { for (int i = 0; i < 4 && toAdd > 0; i++) { ItemStack stack = player.inventory.armorInventory[nextIndex]; - if(EnergyUpgrade.loadFromItem(stack) != null) { + if(stack != null && (EnergyUpgrade.loadFromItem(stack) != null || (Config.darkSteelSolarChargeOthers && stack.getItem() instanceof IEnergyContainerItem))) { toAdd -= ((IEnergyContainerItem) stack.getItem()).receiveEnergy(stack, toAdd, false); } nextIndex = (nextIndex + 1) % 4;