Add speed and power cap upgrades to the Soul Engine

src/machines/java/com/enderio/machines/client/gui/screen/SoulEngineScreen.java

@@ -56,8 +56,10 @@ protected void renderLabels(GuiGraphics guiGraphics, int pMouseX, int pMouseY) {
             }
             EngineSoul.SoulData data = EngineSoul.ENGINE.map.get(rl.get());
             if (data != null) {
-                guiGraphics.drawString(font, data.tickpermb() + " t/mb", imageWidth / 2f + 12 , 40, 4210752, false);
-                guiGraphics.drawString(font, data.powerpermb() + " µI/mb", imageWidth / 2f + 12 , 50, 4210752, false);
+                double burnRate = menu.getBlockEntity().getBurnRate();
+                float genRate = menu.getBlockEntity().getGenerationRate();
+                guiGraphics.drawString(font, data.tickpermb()/ burnRate + " t/mb", imageWidth / 2f + 12 , 40, 4210752, false);
+                guiGraphics.drawString(font, (int) (data.powerpermb() * genRate) + " µI/mb", imageWidth / 2f + 12 , 50, 4210752, false);
 
             }
         }

src/machines/java/com/enderio/machines/common/blockentity/SoulEngineBlockEntity.java

@@ -3,6 +3,7 @@
 import com.enderio.api.capability.StoredEntityData;
 import com.enderio.api.capacitor.CapacitorModifier;
 import com.enderio.api.capacitor.FixedScalable;
+import com.enderio.api.capacitor.LinearScalable;
 import com.enderio.api.capacitor.QuadraticScalable;
 import com.enderio.api.io.energy.EnergyIOMode;
 import com.enderio.core.common.network.slot.FluidStackNetworkDataSlot;
@@ -46,6 +47,10 @@
 public class SoulEngineBlockEntity extends PoweredMachineBlockEntity {
 
     private static final QuadraticScalable CAPACITY = new QuadraticScalable(CapacitorModifier.ENERGY_CAPACITY, MachinesConfig.COMMON.ENERGY.SOUL_ENGINE_CAPACITY);
+    public static final LinearScalable BURN_SPEED = new LinearScalable(CapacitorModifier.FIXED, MachinesConfig.COMMON.ENERGY.SOUL_ENGINE_BURN_SPEED);
+    //TODO capacitor increase efficiency
+    public static final LinearScalable GENERATION_SPEED = new LinearScalable(CapacitorModifier.FIXED, () -> 1);
+
     private static final String BURNED_TICKS = "BurnedTicks";
     private StoredEntityData entityData = StoredEntityData.empty();
     public static final int FLUID_CAPACITY = 2 * FluidType.BUCKET_VOLUME;
@@ -97,17 +102,27 @@ protected boolean isActive() {
     }
 
     public void producePower() {
-        if (burnedTicks == soulData.tickpermb()) {
-            if (!getFluidTankNN().isEmpty() && getEnergyStorage().addEnergy(soulData.powerpermb(), true) == soulData.powerpermb()) {
+        if (burnedTicks >= soulData.tickpermb()) {
+            int energy = (int) (soulData.powerpermb() * getGenerationRate());
+            if (!getFluidTankNN().isEmpty() && getEnergyStorage().addEnergy(energy, true) == energy) {
                 getFluidTankNN().drain(1, IFluidHandler.FluidAction.EXECUTE);
-                getEnergyStorage().addEnergy(soulData.powerpermb());
-                burnedTicks = 0;
+                getEnergyStorage().addEnergy(energy);
+                burnedTicks -= soulData.tickpermb();
             }
         } else {
-            burnedTicks ++;
+            burnedTicks += getBurnRate();
         }
     }
 
+    public int getBurnRate() {
+        return BURN_SPEED.scaleI(this::getCapacitorData).get();
+    }
+
+    public float getGenerationRate() {
+        //TODO return GENERATION_SPEED.scaleF(this::getCapacitorData).get();
+        return MachinesConfig.COMMON.ENERGY.SOUL_ENGINE_BURN_SPEED.get();
+    }
+
     @Override
     protected @Nullable FluidTank createFluidTank() {
         return new MachineFluidTank(FLUID_CAPACITY, isFluidValid(), this) {

src/machines/java/com/enderio/machines/common/blockentity/base/PoweredMachineBlockEntity.java

@@ -306,9 +306,10 @@ private void cacheCapacitorData() {
         capacitorCacheDirty = false;
 
         // Don't do this on client side, client waits for the sync packet.
-        if (level.isClientSide()) {
-            return;
-        }
+        // TODO Do we want to sync with a packet cause right now we don't
+//        if (level.isClientSide()) {
+//            return;
+//        }
 
         MachineInventoryLayout layout = getInventoryLayout();
         if (requiresCapacitor() && layout != null) {

src/machines/java/com/enderio/machines/common/config/common/EnergyConfig.java

@@ -34,6 +34,8 @@ public class EnergyConfig {
     public final ForgeConfigSpec.ConfigValue<Integer> WIRED_CHARGER_CAPACITY;
     public final ForgeConfigSpec.ConfigValue<Integer> WIRED_CHARGER_USAGE;
     public final ForgeConfigSpec.ConfigValue<Integer> SOUL_ENGINE_CAPACITY;
+    public final ForgeConfigSpec.ConfigValue<Integer> SOUL_ENGINE_BURN_SPEED;
+    public final ForgeConfigSpec.ConfigValue<Double> SOUL_ENGINE_GENERATION;
     public final ForgeConfigSpec.ConfigValue<Integer> DRAIN_CAPACITY;
     public final ForgeConfigSpec.ConfigValue<Integer> DRAIN_USAGE;
 
@@ -93,8 +95,7 @@ public EnergyConfig(ForgeConfigSpec.Builder builder) {
         builder.push("paintingMachine");
             PAINTING_MACHINE_CAPACITY = builder.comment("The base energy capacity in uI.").defineInRange("capacity", 64_000, 1, Integer.MAX_VALUE);
             PAINTING_MACHINE_USAGE = builder.comment("The base energy consumption in uI/t.").defineInRange("usage", 30, 1, Integer.MAX_VALUE);
-            PAINTING_MACHINE_ENERGY_COST = builder.comment("The energy required for each painting operation")
-                .defineInRange("energyCost", 2_400, 1, Integer.MAX_VALUE);
+            PAINTING_MACHINE_ENERGY_COST = builder.comment("The energy required for each painting operation").defineInRange("energyCost", 2_400, 1, Integer.MAX_VALUE);
         builder.pop();
 
         builder.push("photovoltaicCellRates");
@@ -116,14 +117,16 @@ public EnergyConfig(ForgeConfigSpec.Builder builder) {
             WIRED_CHARGER_USAGE = builder.comment("The base energy consumption in uI/t.").defineInRange("usage", 64, 1, Integer.MAX_VALUE);
         builder.pop();
 
-        builder.push("mob_generator");
+        builder.push("soul_engine");
             SOUL_ENGINE_CAPACITY = builder.defineInRange("capacity",100000, 1, Integer.MAX_VALUE);
+            SOUL_ENGINE_BURN_SPEED = builder.comment("The base burn-rate the soul engine.").defineInRange("burnSpeed", 1, 1, Integer.MAX_VALUE);
+            SOUL_ENGINE_GENERATION = builder.comment("Percentage increase in uI produced.").defineInRange("generation", 1.0, 0.001, Double.MAX_VALUE);
+
         builder.pop();
 
         builder.push("drain");
             DRAIN_CAPACITY = builder.comment("The base energy capacity in uI.").defineInRange("capacity", 64_000, 1, Integer.MAX_VALUE);
             DRAIN_USAGE = builder.comment("The base energy consumption in uI/t.").defineInRange("usage",  10, 1, Integer.MAX_VALUE);
-
         builder.pop();
 
         builder.pop();

src/machines/resources/assets/enderio/models/block/soul_engine_active.json

@@ -1,5 +1,5 @@
 {
-  "parent": "enderio:block/stirling_generator",
+  "parent": "enderio:block/soul_engine",
   "textures": {
     "north": "enderio:block/soul_engine_front_active"
   }