Port Central Monitor

src/main/java/gregtech/api/capability/GregtechDataCodes.java

@@ -32,6 +32,7 @@ public class GregtechDataCodes {
     public static final int UPDATE_UI = 0;
     public static final int CREATE_FAKE_UI = 1;
     public static final int MOUSE_POSITION = 2;
+    public static final int DETECT_UPDATE_RECEIVED = 3;
 
     // Pump
     public static final int PUMP_HEAD_LEVEL = 200;
@@ -69,4 +70,30 @@ public class GregtechDataCodes {
     public static final int DEFORM_TANK = 2;
     public static final int SYNC_FLUID_CHANGE = 3;
     public static final int SYNC_TANK_SHAPE = 4;
+
+    // Central Monitor
+    public static final int UPDATE_ALL = 1;
+    public static final int UPDATE_COVERS = 2;
+    public static final int UPDATE_HEIGHT = 3;
+    public static final int UPDATE_ACTIVE = 4;
+    public static final int UPDATE_PLUGIN_ITEM = 3;
+
+    // Central Monitor Plugin
+    public static final int UPDATE_PLUGIN_DATA = 2;
+    public static final int UPDATE_PLUGIN_CONFIG = 0;
+    public static final int ACTION_PLUGIN_CONFIG = 0;
+    public static final int UPDATE_PLUGIN_CLICK = -2;
+    public static final int UPDATE_ADVANCED_VALID_POS = 1;
+    public static final int UPDATE_FAKE_GUI = 1;
+    public static final int ACTION_FAKE_GUI = 1;
+    public static final int UPDATE_FAKE_GUI_DETECT = -1;
+
+    // Digital Interface
+    public static final int UPDATE_MODE = 1;
+    public static final int UPDATE_FLUID = 2;
+    public static final int UPDATE_ITEM = 3;
+    public static final int UPDATE_ENERGY = 4;
+    public static final int UPDATE_ENERGY_PER = 5;
+    public static final int UPDATE_MACHINE = 6;
+
 }

src/main/java/gregtech/api/capability/IEnergyContainer.java

@@ -98,6 +98,16 @@ default long getOutputVoltage() {
      */
     long getInputVoltage();
 
+    /**
+     * @return input eu/s
+     */
+    default long getInputPerSec() {return 0L;}
+
+    /**
+     * @return output eu/s
+     */
+    default long getOutputPerSec() {return 0L;}
+
     /**
      * @return true if information like energy capacity should be hidden from TOP.
      * Useful for cables
@@ -106,4 +116,40 @@ default boolean isOneProbeHidden() {
         return false;
     }
 
+    IEnergyContainer DEFAULT = new IEnergyContainer() {
+        @Override
+        public long acceptEnergyFromNetwork(EnumFacing enumFacing, long l, long l1) {
+            return 0;
+        }
+
+        @Override
+        public boolean inputsEnergy(EnumFacing enumFacing) {
+            return false;
+        }
+
+        @Override
+        public long changeEnergy(long l) {
+            return 0;
+        }
+
+        @Override
+        public long getEnergyStored() {
+            return 0;
+        }
+
+        @Override
+        public long getEnergyCapacity() {
+            return 0;
+        }
+
+        @Override
+        public long getInputAmperage() {
+            return 0;
+        }
+
+        @Override
+        public long getInputVoltage() {
+            return 0;
+        }
+    };
 }

src/main/java/gregtech/api/capability/impl/AbstractRecipeLogic.java

@@ -67,6 +67,8 @@ public AbstractRecipeLogic(MetaTileEntity tileEntity, RecipeMap<?> recipeMap, bo
         this.hasPerfectOC = hasPerfectOC;
     }
 
+    protected abstract long getEnergyInputPerSecond();
+
     protected abstract long getEnergyStored();
 
     protected abstract long getEnergyCapacity();
@@ -174,6 +176,9 @@ protected void updateRecipeProgress() {
             if (++progressTime > maxProgressTime) {
                 completeRecipe();
             }
+            if (this.hasNotEnoughEnergy && getEnergyInputPerSecond() > 19 * recipeEUt) {
+                this.hasNotEnoughEnergy = false;
+            }
         } else if (recipeEUt > 0) {
             //only set hasNotEnoughEnergy if this recipe is consuming recipe
             //generators always have enough energy

src/main/java/gregtech/api/capability/impl/EnergyContainerBatteryBuffer.java

@@ -24,6 +24,10 @@ public class EnergyContainerBatteryBuffer extends MTETrait implements IEnergyCon
     private final BitSet batterySlotsUsedThisTick = new BitSet();
     private final int tier;
     private long amps = 0;
+    private long lastEnergyInputPerSec = 0;
+    private long lastEnergyOutputPerSec = 0;
+    private long energyInputPerSec = 0;
+    private long energyOutputPerSec = 0;
 
     public EnergyContainerBatteryBuffer(MetaTileEntity metaTileEntity, int tier) {
         super(metaTileEntity);
@@ -59,9 +63,20 @@ public long acceptEnergyFromNetwork(EnumFacing side, long voltage, long amperage
             notifyEnergyListener(false);
         }
         amps += usedAmps;
+        energyInputPerSec += voltage * usedAmps;
         return usedAmps;
     }
 
+    @Override
+    public long getInputPerSec() {
+        return lastEnergyInputPerSec;
+    }
+
+    @Override
+    public long getOutputPerSec() {
+        return lastEnergyOutputPerSec;
+    }
+
     private static boolean chargeItemWithVoltage(IElectricItem electricItem, long voltage, int tier, boolean simulate) {
         long charged = electricItem.charge(voltage, tier, false, simulate);
         return charged > 0;
@@ -79,6 +94,12 @@ private static long chargeItem(IElectricItem electricItem, long amount, int tier
     public void update() {
         amps = 0;
         if (!metaTileEntity.getWorld().isRemote) {
+            if (metaTileEntity.getOffsetTimer() % 20 == 0) {
+                lastEnergyInputPerSec = energyInputPerSec;
+                lastEnergyOutputPerSec = energyOutputPerSec;
+                energyInputPerSec = 0;
+                energyOutputPerSec = 0;
+            }
             this.batterySlotsUsedThisTick.clear();
             EnumFacing outFacing = metaTileEntity.getFrontFacing();
             TileEntity tileEntity = metaTileEntity.getWorld().getTileEntity(metaTileEntity.getPos().offset(outFacing));
@@ -106,6 +127,7 @@ public void update() {
             if (maxAmperage == 0) return;
             long amperageUsed = energyContainer.acceptEnergyFromNetwork(outFacing.getOpposite(), voltage, maxAmperage);
             if (amperageUsed == 0) return;
+            energyOutputPerSec += amperageUsed * voltage;
             for (int i : slotsList.toArray()) {
                 ItemStack batteryStack = inventory.getStackInSlot(i);
                 IElectricItem electricItem = getBatteryContainer(batteryStack);
@@ -183,6 +205,7 @@ public long changeEnergy(long energyToAdd) {
         if (energyAdded > 0L) {
             notifyEnergyListener(false);
         }
+        energyInputPerSec += energyAdded;
         return energyAdded;
     }
 

src/main/java/gregtech/api/capability/impl/EnergyContainerHandler.java

@@ -26,6 +26,11 @@ public class EnergyContainerHandler extends MTETrait implements IEnergyContainer
     private final long maxOutputVoltage;
     private final long maxOutputAmperage;
 
+    private long lastEnergyInputPerSec = 0;
+    private long lastEnergyOutputPerSec = 0;
+    private long energyInputPerSec = 0;
+    private long energyOutputPerSec = 0;
+
     private Predicate<EnumFacing> sideInputCondition;
     private Predicate<EnumFacing> sideOutputCondition;
 
@@ -56,6 +61,16 @@ public static EnergyContainerHandler receiverContainer(MetaTileEntity tileEntity
         return new EnergyContainerHandler(tileEntity, maxCapacity, maxInputVoltage, maxInputAmperage, 0L, 0L);
     }
 
+    @Override
+    public long getInputPerSec() {
+        return lastEnergyInputPerSec;
+    }
+
+    @Override
+    public long getOutputPerSec() {
+        return lastEnergyOutputPerSec;
+    }
+
     @Override
     public String getName() {
         return "EnergyContainer";
@@ -93,6 +108,11 @@ public long getEnergyStored() {
     }
 
     public void setEnergyStored(long energyStored) {
+        if (energyStored > this.energyStored) {
+            energyInputPerSec += energyStored - this.energyStored;
+        } else {
+            energyOutputPerSec += this.energyStored - energyStored;
+        }
         this.energyStored = energyStored;
         if (!metaTileEntity.getWorld().isRemote) {
             metaTileEntity.markDirty();
@@ -138,6 +158,12 @@ public void update() {
         amps = 0;
         if (getMetaTileEntity().getWorld().isRemote)
             return;
+        if (metaTileEntity.getOffsetTimer() % 20 == 0) {
+            lastEnergyOutputPerSec = energyOutputPerSec;
+            lastEnergyInputPerSec = energyInputPerSec;
+            energyOutputPerSec = 0;
+            energyInputPerSec = 0;
+        }
         if (getEnergyStored() >= getOutputVoltage() && getOutputVoltage() > 0 && getOutputAmperage() > 0) {
             long outputVoltage = getOutputVoltage();
             long outputAmperes = Math.min(getEnergyStored() / outputVoltage, getOutputAmperage());

src/main/java/gregtech/api/capability/impl/EnergyContainerList.java

@@ -13,6 +13,24 @@ public EnergyContainerList(List<IEnergyContainer> energyContainerList) {
         this.energyContainerList = energyContainerList;
     }
 
+    @Override
+    public long getInputPerSec() {
+        long sum = 0;
+        for (IEnergyContainer energyContainer : energyContainerList) {
+            sum += energyContainer.getInputPerSec();
+        }
+        return sum;
+    }
+
+    @Override
+    public long getOutputPerSec() {
+        long sum = 0;
+        for (IEnergyContainer energyContainer : energyContainerList) {
+            sum += energyContainer.getOutputPerSec();
+        }
+        return sum;
+    }
+
     @Override
     public long acceptEnergyFromNetwork(EnumFacing side, long voltage, long amperage) {
         long amperesUsed = 0L;

src/main/java/gregtech/api/capability/impl/MultiblockRecipeLogic.java

@@ -219,6 +219,11 @@ protected void completeRecipe() {
         super.completeRecipe();
     }
 
+    @Override
+    protected long getEnergyInputPerSecond() {
+        return getEnergyContainer().getInputPerSec();
+    }
+
     @Override
     protected long getEnergyStored() {
         return getEnergyContainer().getEnergyStored();

src/main/java/gregtech/api/capability/impl/PrimitiveRecipeLogic.java

@@ -13,6 +13,11 @@ public PrimitiveRecipeLogic(RecipeMapPrimitiveMultiblockController tileEntity, R
         super(tileEntity, recipeMap);
     }
 
+    @Override
+    protected long getEnergyInputPerSecond() {
+        return Integer.MAX_VALUE;
+    }
+
     @Override
     protected long getEnergyStored() {
         return Integer.MAX_VALUE;

src/main/java/gregtech/api/capability/impl/RecipeLogicEnergy.java

@@ -15,6 +15,11 @@ public RecipeLogicEnergy(MetaTileEntity tileEntity, RecipeMap<?> recipeMap, Supp
         this.energyContainer = energyContainer;
     }
 
+    @Override
+    protected long getEnergyInputPerSecond() {
+        return energyContainer.get().getInputPerSec();
+    }
+
     @Override
     protected long getEnergyStored() {
         return energyContainer.get().getEnergyStored();

src/main/java/gregtech/api/capability/impl/RecipeLogicSteam.java

@@ -175,6 +175,11 @@ protected int[] calculateOverclock(int EUt, long voltage, int duration) {
         };
     }
 
+    @Override
+    protected long getEnergyInputPerSecond() {
+        return 0;
+    }
+
     @Override
     protected long getEnergyStored() {
         return (long) Math.ceil(steamFluidTank.getFluidAmount() * conversionRate);

src/main/java/gregtech/api/capability/impl/SteamMultiblockRecipeLogic.java

@@ -80,6 +80,11 @@ public void update() {
         super.update();
     }
 
+    @Override
+    protected long getEnergyInputPerSecond() {
+        return 0;
+    }
+
     @Override
     protected long getEnergyStored() {
         combineSteamTanks();