mirror of
https://github.com/GTNewHorizons/TinkersConstruct.git
synced 2026-11-20 04:09:40 +00:00
Merge branch 'master' into weaponry
Conflicts: src/main/java/tconstruct/tools/TinkerTools.java
This commit is contained in:
commit
939bd8a0ae
11 files changed
+176
-93
No files matched your search
@@ -56,6 +56,12 @@ public class ModFlux extends ModBoolean
|
||||
if (foundBattery == null)
|
||||
return false;
|
||||
|
||||
int maxEnergy = ((IEnergyContainerItem) foundBattery.getItem()).getMaxEnergyStored(foundBattery);
|
||||
|
||||
// battery too big for our tool?
|
||||
if(tags.getInteger("TotalDurability") < maxEnergy/1000) // durability needs to be at least 1/1000th of the charge
|
||||
return false;
|
||||
|
||||
// check if we already have a flux modifier
|
||||
if (tags.getBoolean(key))
|
||||
{
|
||||
|
||||
Reference in new issue
Block a user