Added a priority to IAEPowerStorage (#4473)

Added a priority to IAEPowerStorage

src/main/java/appeng/me/cache/EnergyGridCache.java

@@ -23,16 +23,18 @@ import java.util.Comparator;
 import java.util.HashMap;
 import java.util.HashSet;
 import java.util.Iterator;
-import java.util.LinkedHashSet;
 import java.util.NavigableSet;
 import java.util.PriorityQueue;
 import java.util.Queue;
 import java.util.Set;
+import java.util.SortedSet;
 
 import com.google.common.collect.HashMultiset;
 import com.google.common.collect.Multiset;
 import com.google.common.collect.Sets;
 
+import it.unimi.dsi.fastutil.objects.ObjectRBTreeSet;
+
 import appeng.api.config.AccessRestriction;
 import appeng.api.config.Actionable;
 import appeng.api.config.PowerMultiplier;
@@ -72,10 +74,15 @@ public class EnergyGridCache implements IEnergyGrid {
         return Double.compare(percent1, percent2);
     };
 
+    private static final Comparator<IAEPowerStorage> COMPARATOR_HIGHEST_PRIORITY_FIRST = (o1, o2) -> Integer
+            .compare(o2.getPriority(), o1.getPriority());
+    private static final Comparator<IAEPowerStorage> COMPARATOR_LOWEST_PRIORITY_FIRST = (o1, o2) -> Integer
+            .compare(o1.getPriority(), o2.getPriority());
+
     private final NavigableSet<EnergyThreshold> interests = Sets.newTreeSet();
     private final double averageLength = 40.0;
-    private final Set<IAEPowerStorage> providers = new LinkedHashSet<>();
-    private final Set<IAEPowerStorage> requesters = new LinkedHashSet<>();
+    private final SortedSet<IAEPowerStorage> providers = new ObjectRBTreeSet<>(COMPARATOR_HIGHEST_PRIORITY_FIRST);
+    private final SortedSet<IAEPowerStorage> requesters = new ObjectRBTreeSet<>(COMPARATOR_LOWEST_PRIORITY_FIRST);
     private final Multiset<IEnergyGridProvider> energyGridProviders = HashMultiset.create();
     private final IGrid myGrid;
     private final HashMap<IGridNode, IEnergyWatcher> watchers = new HashMap<>();
@@ -572,6 +579,12 @@ public class EnergyGridCache implements IEnergyGrid {
             return this.stored;
         }
 
+        @Override
+        public int getPriority() {
+            // MIN_VALUE to push it to the back
+            return Integer.MIN_VALUE;
+        }
+
         private void addCurrentAEPower(double amount) {
             this.stored += amount;
 

src/main/java/appeng/tile/networking/CreativeEnergyCellTileEntity.java

@@ -69,4 +69,10 @@ public class CreativeEnergyCellTileEntity extends AENetworkTileEntity implements
     public double extractAEPower(final double amt, final Actionable mode, final PowerMultiplier pm) {
         return amt;
     }
+
+    @Override
+    public int getPriority() {
+        // MAX_VALUE to move creative cells to the front.
+        return Integer.MAX_VALUE;
+    }
 }

src/main/java/appeng/tile/networking/DenseEnergyCellTileEntity.java

@@ -22,9 +22,16 @@ import net.minecraft.tileentity.TileEntityType;
 
 public class DenseEnergyCellTileEntity extends EnergyCellTileEntity {
 
+    private final static double MAX_STORED = 200000 * 8;
+
     public DenseEnergyCellTileEntity(TileEntityType<?> tileEntityTypeIn) {
         super(tileEntityTypeIn);
-        this.setInternalMaxPower(200000 * 8);
+        this.setInternalMaxPower(MAX_STORED);
+    }
+
+    @Override
+    public int getPriority() {
+        return 1600;
     }
 
 }

src/main/java/appeng/tile/networking/EnergyCellTileEntity.java

@@ -36,8 +36,10 @@ import appeng.util.SettingsFrom;
 
 public class EnergyCellTileEntity extends AENetworkTileEntity implements IAEPowerStorage {
 
+    private static final double MAX_STORED = 200000.0;
+
     private double internalCurrentPower = 0.0;
-    private double internalMaxPower = 200000.0;
+    private double internalMaxPower = MAX_STORED;
 
     private byte currentMeta = -1;
 
@@ -179,6 +181,11 @@ public class EnergyCellTileEntity extends AENetworkTileEntity implements IAEPowe
         return pm.divide(this.extractAEPower(pm.multiply(amt), mode));
     }
 
+    @Override
+    public int getPriority() {
+        return 200;
+    }
+
     private double extractAEPower(double amt, final Actionable mode) {
         if (mode == Actionable.SIMULATE) {
             if (this.internalCurrentPower > amt) {
@@ -218,4 +225,5 @@ public class EnergyCellTileEntity extends AENetworkTileEntity implements IAEPowe
     void setInternalMaxPower(final double internalMaxPower) {
         this.internalMaxPower = internalMaxPower;
     }
+
 }