Merge pull request Team-EnderIO#171 from Rover656/feature/machine-charge-limit

Machine Energy Input Cap

Author: Rover656

Diff for: src/conduits/java/com/enderio/conduits/common/types/EnergyConduitTicker.java

@@ -44,6 +44,15 @@ public void tickCapabilityGraph(IConduitType<?> type, List<CapabilityConnection>
         }
     }
 
+    /**
+     * This ensures consistent behaviour for FE/t caps and more.
+     * @return how often the conduit should tick. 1 is every tick, 5 is every 5th tick, so 4 times a second
+     */
+    @Override
+    public int getTickRate() {
+        return 1;
+    }
+
     @Override
     public Capability<IEnergyStorage> getCapability() {
         return ForgeCapabilities.ENERGY;

Diff for: src/machines/java/com/enderio/machines/common/io/energy/MachineEnergyStorage.java

@@ -115,7 +115,7 @@ public boolean canReceive() {
     public int receiveEnergy(int maxReceive, boolean simulate) {
         if (!canReceive())
             return 0;
-        int energyReceived = Math.min(getMaxEnergyStored() - getEnergyStored(), maxReceive);
+        int energyReceived = Math.min(getMaxEnergyStored() - getEnergyStored(), Math.min(getMaxEnergyUse() * 2, maxReceive));
         if (!simulate) {
             addEnergy(energyReceived);
         }