为canExtract和canReceive添加参数使其可以只向法定的IEnergyHandler发送/接收能源

Author: Circulate233

src/main/java/com/circulation/circulation_networks/api/IEnergyHandler.java

@@ -49,9 +49,9 @@ static IEnergyHandler release(ItemStack stack) {
 
     long canReceiveValue();
 
-    boolean canExtract();
+    boolean canExtract(IEnergyHandler receiveHandler);
 
-    boolean canReceive();
+    boolean canReceive(IEnergyHandler sendHandler);
 
     default void recycle() {
         this.clear();
@@ -62,8 +62,8 @@ default void recycle() {
     }
 
     default EnergyType getType() {
-        boolean receive = canReceive();
-        if (canExtract()) {
+        boolean receive = canReceiveValue() > 0;
+        if (canExtractValue() > 0) {
             return receive ? EnergyType.STORAGE : EnergyType.SEND;
         } else if (receive) {
             return EnergyType.RECEIVE;

src/main/java/com/circulation/circulation_networks/energy/handler/CEHandler.java

@@ -65,12 +65,12 @@ public long canReceiveValue() {
     }
 
     @Override
-    public boolean canExtract() {
+    public boolean canExtract(IEnergyHandler receiveHandler) {
         return type != EnergyType.RECEIVE && canExtractValue() > 0;
     }
 
     @Override
-    public boolean canReceive() {
+    public boolean canReceive(IEnergyHandler sendHandler) {
         return type != EnergyType.SEND && canReceiveValue() > 0;
     }
 

src/main/java/com/circulation/circulation_networks/energy/handler/EUHandler.java

@@ -52,7 +52,8 @@ public IEnergyHandler init(TileEntity tileEntity) {
             energyType = EnergyType.RECEIVE;
             receive = (IEnergySink) tile;
         }
-        if (!canExtract() && !canReceive()) energyType = EnergyType.INVALID;
+        if (!(send != null && send.getOfferedEnergy() > 0) && !(receive != null && receive.getDemandedEnergy() > 0))
+            energyType = EnergyType.INVALID;
         return this;
     }
 
@@ -110,12 +111,12 @@ public long canReceiveValue() {
     }
 
     @Override
-    public boolean canExtract() {
+    public boolean canExtract(IEnergyHandler receiveHandler) {
         return send != null && send.getOfferedEnergy() > 0;
     }
 
     @Override
-    public boolean canReceive() {
+    public boolean canReceive(IEnergyHandler sendHandler) {
         if (isItem) {
             return ElectricItem.manager.getMaxCharge(itemStack) > 0;
         } else {

src/main/java/com/circulation/circulation_networks/energy/handler/FEHandler.java

@@ -91,12 +91,12 @@ public EnergyType getType() {
     }
 
     @Override
-    public boolean canExtract() {
+    public boolean canExtract(IEnergyHandler receiveHandler) {
         return send != null;
     }
 
     @Override
-    public boolean canReceive() {
+    public boolean canReceive(IEnergyHandler sendHandler) {
         return receive != null;
     }
 }

src/main/java/com/circulation/circulation_networks/energy/handler/MEKHandler.java

@@ -163,13 +163,13 @@ public long canReceiveValue() {
     }
 
     @Override
-    public boolean canExtract() {
+    public boolean canExtract(IEnergyHandler receiveHandler) {
         if (creative) return true;
         return send != null && send.getEnergy() >= 2.5;
     }
 
     @Override
-    public boolean canReceive() {
+    public boolean canReceive(IEnergyHandler sendHandler) {
         if (isItem) return needEnergy > 0;
         else return receive != null && (receive.getMaxEnergy() - receive.getEnergy()) / 2.5 >= 0;
     }