Make the ejector component able to handle energy, and make the energy…

… cube eject through it. Also, slightly cleanup calls to EnergyDisplay, and rework how the QE handles auto ejecting: - Eject the entire buffer instead of being limited by the chemical or fluid eject rate - Try to evenly distribute (except for items) across the different QEs on the frequency instead of just in the order they are ticked. This should help reduce the cases where one QE ends up providing all its energy and the next one that ticks has none to provide; though there are still cases where if a transmitter is set to pull that transmitter may cause other QEs on the same network to get "starved out" depending on the order things tick
mekanism · Nov 14, 2021 · d7e9b43 · d7e9b43
1 parent c330ab3
commit d7e9b43
Show file tree

Hide file tree

Showing 21 changed files with 257 additions and 82 deletions.
diff --git a/src/generators/java/mekanism/generators/client/gui/GuiFusionReactorController.java b/src/generators/java/mekanism/generators/client/gui/GuiFusionReactorController.java
@@ -30,7 +30,7 @@ protected void addGuiElements() {
         if (tile.getMultiblock().isFormed()) {
             addButton(new GuiEnergyTab(this, () -> {
                 FusionReactorMultiblockData multiblock = tile.getMultiblock();
-                return Arrays.asList(MekanismLang.STORING.translate(EnergyDisplay.of(multiblock.energyContainer.getEnergy(), multiblock.energyContainer.getMaxEnergy())),
+                return Arrays.asList(MekanismLang.STORING.translate(EnergyDisplay.of(multiblock.energyContainer)),
                       GeneratorsLang.PRODUCING_AMOUNT.translate(EnergyDisplay.of(multiblock.getPassiveGeneration(false, true))));
             }));
             addButton(new GuiFusionReactorTab(this, tile, FusionReactorTab.HEAT));

diff --git a/src/generators/java/mekanism/generators/client/gui/GuiFusionReactorFuel.java b/src/generators/java/mekanism/generators/client/gui/GuiFusionReactorFuel.java
@@ -37,7 +37,7 @@ protected void addGuiElements() {
         super.addGuiElements();
         addButton(new GuiEnergyTab(this, () -> {
             FusionReactorMultiblockData multiblock = tile.getMultiblock();
-            return Arrays.asList(MekanismLang.STORING.translate(EnergyDisplay.of(multiblock.energyContainer.getEnergy(), multiblock.energyContainer.getMaxEnergy())),
+            return Arrays.asList(MekanismLang.STORING.translate(EnergyDisplay.of(multiblock.energyContainer)),
                   GeneratorsLang.PRODUCING_AMOUNT.translate(EnergyDisplay.of(multiblock.getPassiveGeneration(false, true))));
         }));
         addButton(new GuiGasGauge(() -> tile.getMultiblock().deuteriumTank, () -> tile.getMultiblock().getGasTanks(null), GaugeType.SMALL, this, 25, 64));

diff --git a/src/generators/java/mekanism/generators/client/gui/GuiFusionReactorHeat.java b/src/generators/java/mekanism/generators/client/gui/GuiFusionReactorHeat.java
@@ -42,7 +42,7 @@ protected void addGuiElements() {
         super.addGuiElements();
         addButton(new GuiEnergyTab(this, () -> {
             FusionReactorMultiblockData multiblock = tile.getMultiblock();
-            return Arrays.asList(MekanismLang.STORING.translate(EnergyDisplay.of(multiblock.energyContainer.getEnergy(), multiblock.energyContainer.getMaxEnergy())),
+            return Arrays.asList(MekanismLang.STORING.translate(EnergyDisplay.of(multiblock.energyContainer)),
                   GeneratorsLang.PRODUCING_AMOUNT.translate(EnergyDisplay.of(multiblock.getPassiveGeneration(false, true))));
         }));
         addButton(new GuiNumberGauge(new INumberInfoHandler() {

diff --git a/src/generators/java/mekanism/generators/client/gui/GuiFusionReactorStats.java b/src/generators/java/mekanism/generators/client/gui/GuiFusionReactorStats.java
@@ -30,7 +30,7 @@ protected void addGuiElements() {
         super.addGuiElements();
         addButton(new GuiEnergyTab(this, () -> {
             FusionReactorMultiblockData multiblock = tile.getMultiblock();
-            return Arrays.asList(MekanismLang.STORING.translate(EnergyDisplay.of(multiblock.energyContainer.getEnergy(), multiblock.energyContainer.getMaxEnergy())),
+            return Arrays.asList(MekanismLang.STORING.translate(EnergyDisplay.of(multiblock.energyContainer)),
                   GeneratorsLang.PRODUCING_AMOUNT.translate(EnergyDisplay.of(multiblock.getPassiveGeneration(false, true))));
         }));
         addButton(new GuiFusionReactorTab(this, tile, FusionReactorTab.HEAT));

diff --git a/src/generators/java/mekanism/generators/client/gui/GuiIndustrialTurbine.java b/src/generators/java/mekanism/generators/client/gui/GuiIndustrialTurbine.java
@@ -57,7 +57,7 @@ protected void addGuiElements() {
             public ITextComponent getTooltip() {
                 TurbineMultiblockData multiblock = tile.getMultiblock();
                 if (multiblock.isFormed()) {
-                    return EnergyDisplay.of(multiblock.energyContainer.getEnergy(), multiblock.energyContainer.getMaxEnergy()).getTextComponent();
+                    return EnergyDisplay.of(multiblock.energyContainer).getTextComponent();
                 }
                 return EnergyDisplay.ZERO.getTextComponent();
             }
@@ -97,7 +97,7 @@ public double getLevel() {
             EnergyDisplay producing;
             TurbineMultiblockData multiblock = tile.getMultiblock();
             if (multiblock.isFormed()) {
-                storing = EnergyDisplay.of(multiblock.energyContainer.getEnergy(), multiblock.energyContainer.getMaxEnergy());
+                storing = EnergyDisplay.of(multiblock.energyContainer);
                 producing = EnergyDisplay.of(MekanismConfig.general.maxEnergyPerSteam.get().divide(TurbineValidator.MAX_BLADES)
                       .multiply(multiblock.clientFlow * Math.min(multiblock.blades,
                             multiblock.coils * MekanismGeneratorsConfig.generators.turbineBladesPerCoil.get())));

diff --git a/src/generators/java/mekanism/generators/client/gui/GuiSolarGenerator.java b/src/generators/java/mekanism/generators/client/gui/GuiSolarGenerator.java
@@ -29,7 +29,7 @@ public GuiSolarGenerator(MekanismTileContainer<TILE> container, PlayerInventory
     protected void addGuiElements() {
         super.addGuiElements();
         addButton(new GuiInnerScreen(this, 48, 23, 80, 40, () -> Arrays.asList(
-              EnergyDisplay.of(tile.getEnergyContainer().getEnergy(), tile.getEnergyContainer().getMaxEnergy()).getTextComponent(),
+              EnergyDisplay.of(tile.getEnergyContainer()).getTextComponent(),
               GeneratorsLang.PRODUCING_AMOUNT.translate(EnergyDisplay.of(tile.getLastProductionAmount())),
               GeneratorsLang.OUTPUT_RATE_SHORT.translate(EnergyDisplay.of(tile.getMaxOutput()))
         )));

diff --git a/src/generators/java/mekanism/generators/client/gui/GuiTurbineStats.java b/src/generators/java/mekanism/generators/client/gui/GuiTurbineStats.java
@@ -36,7 +36,7 @@ protected void addGuiElements() {
             EnergyDisplay producing;
             TurbineMultiblockData multiblock = tile.getMultiblock();
             if (multiblock.isFormed()) {
-                storing = EnergyDisplay.of(multiblock.energyContainer.getEnergy(), multiblock.energyContainer.getMaxEnergy());
+                storing = EnergyDisplay.of(multiblock.energyContainer);
                 producing = EnergyDisplay.of(MekanismConfig.general.maxEnergyPerSteam.get().divide(TurbineValidator.MAX_BLADES)
                       .multiply(multiblock.clientFlow * Math.min(multiblock.blades,
                             multiblock.coils * MekanismGeneratorsConfig.generators.turbineBladesPerCoil.get())));

diff --git a/src/generators/java/mekanism/generators/client/gui/GuiWindGenerator.java b/src/generators/java/mekanism/generators/client/gui/GuiWindGenerator.java
@@ -36,7 +36,7 @@ protected void addGuiElements() {
         super.addGuiElements();
         addButton(new GuiInnerScreen(this, 48, 21, 80, 44, () -> {
             List<ITextComponent> list = new ArrayList<>();
-            list.add(EnergyDisplay.of(tile.getEnergyContainer().getEnergy(), tile.getEnergyContainer().getMaxEnergy()).getTextComponent());
+            list.add(EnergyDisplay.of(tile.getEnergyContainer()).getTextComponent());
             list.add(GeneratorsLang.POWER.translate(MekanismUtils.convertToDisplay(MekanismGeneratorsConfig.generators.windGenerationMin.get()
                   .multiply(tile.getCurrentMultiplier())).toString(2)));
             list.add(GeneratorsLang.OUTPUT_RATE_SHORT.translate(EnergyDisplay.of(tile.getMaxOutput())));

diff --git a/src/generators/java/mekanism/generators/common/tile/TileEntityGenerator.java b/src/generators/java/mekanism/generators/common/tile/TileEntityGenerator.java
@@ -51,7 +51,7 @@ protected IEnergyContainerHolder getInitialEnergyContainers() {
     protected void onUpdateServer() {
         super.onUpdateServer();
         if (MekanismUtils.canFunction(this)) {
-            //TODO: Cache the directions?
+            //TODO: Cache the directions or maybe even make some generators have a side config/ejector component and move this to the ejector component?
             Set<Direction> emitDirections = EnumSet.noneOf(Direction.class);
             Direction direction = getDirection();
             for (RelativeSide energySide : getEnergySides()) {

diff --git a/src/main/java/mekanism/client/gui/GuiQuantumEntangloporter.java b/src/main/java/mekanism/client/gui/GuiQuantumEntangloporter.java
@@ -36,7 +36,7 @@ protected void addGuiElements() {
         addButton(new GuiFrequencySelector<>(this, 14));
         addButton(new GuiEnergyTab(this, () -> {
             InventoryFrequency frequency = getFrequency();
-            EnergyDisplay storing = frequency == null ? EnergyDisplay.ZERO : EnergyDisplay.of(frequency.storedEnergy.getEnergy(), frequency.storedEnergy.getMaxEnergy());
+            EnergyDisplay storing = frequency == null ? EnergyDisplay.ZERO : EnergyDisplay.of(frequency.storedEnergy);
             EnergyDisplay rate = EnergyDisplay.of(tile.getInputRate());
             return Arrays.asList(MekanismLang.STORING.translate(storing), MekanismLang.MATRIX_INPUT_RATE.translate(rate));
         }));

diff --git a/src/main/java/mekanism/client/gui/element/bar/GuiHorizontalPowerBar.java b/src/main/java/mekanism/client/gui/element/bar/GuiHorizontalPowerBar.java
@@ -26,7 +26,7 @@ public GuiHorizontalPowerBar(IGuiWrapper gui, IEnergyContainer container, int x,
         this(gui, new IBarInfoHandler() {
             @Override
             public ITextComponent getTooltip() {
-                return EnergyDisplay.of(container.getEnergy(), container.getMaxEnergy()).getTextComponent();
+                return EnergyDisplay.of(container).getTextComponent();
             }
 
             @Override

diff --git a/src/main/java/mekanism/client/gui/element/bar/GuiVerticalPowerBar.java b/src/main/java/mekanism/client/gui/element/bar/GuiVerticalPowerBar.java
@@ -26,7 +26,7 @@ public GuiVerticalPowerBar(IGuiWrapper gui, IEnergyContainer container, int x, i
         this(gui, new IBarInfoHandler() {
             @Override
             public ITextComponent getTooltip() {
-                return EnergyDisplay.of(container.getEnergy(), container.getMaxEnergy()).getTextComponent();
+                return EnergyDisplay.of(container).getTextComponent();
             }
 
             @Override

diff --git a/src/main/java/mekanism/client/gui/item/GuiPortableTeleporter.java b/src/main/java/mekanism/client/gui/item/GuiPortableTeleporter.java
@@ -41,7 +41,7 @@ protected void addGuiElements() {
             @Override
             public ITextComponent getTooltip() {
                 IEnergyContainer container = StorageUtils.getEnergyContainer(menu.getStack(), 0);
-                return container == null ? EnergyDisplay.ZERO.getTextComponent() : EnergyDisplay.of(container.getEnergy(), container.getMaxEnergy()).getTextComponent();
+                return container == null ? EnergyDisplay.ZERO.getTextComponent() : EnergyDisplay.of(container).getTextComponent();
             }
 
             @Override

diff --git a/src/main/java/mekanism/client/gui/machine/GuiElectricPump.java b/src/main/java/mekanism/client/gui/machine/GuiElectricPump.java
@@ -33,7 +33,7 @@ protected void addGuiElements() {
         super.addGuiElements();
         addButton(new GuiInnerScreen(this, 54, 23, 80, 41, () -> {
             List<ITextComponent> list = new ArrayList<>();
-            list.add(EnergyDisplay.of(tile.getEnergyContainer().getEnergy(), tile.getEnergyContainer().getMaxEnergy()).getTextComponent());
+            list.add(EnergyDisplay.of(tile.getEnergyContainer()).getTextComponent());
             FluidStack fluidStack = tile.fluidTank.getFluid();
             if (fluidStack.isEmpty()) {
                 list.add(MekanismLang.NO_FLUID.translate());

diff --git a/src/main/java/mekanism/client/gui/machine/GuiFluidicPlenisher.java b/src/main/java/mekanism/client/gui/machine/GuiFluidicPlenisher.java
@@ -34,7 +34,7 @@ protected void addGuiElements() {
         super.addGuiElements();
         addButton(new GuiInnerScreen(this, 54, 23, 80, 41, () -> {
             List<ITextComponent> list = new ArrayList<>();
-            list.add(EnergyDisplay.of(tile.getEnergyContainer().getEnergy(), tile.getEnergyContainer().getMaxEnergy()).getTextComponent());
+            list.add(EnergyDisplay.of(tile.getEnergyContainer()).getTextComponent());
             list.add(MekanismLang.FINISHED.translate(YesNo.of(tile.finishedCalc)));
             FluidStack fluid = tile.fluidTank.getFluid();
             if (fluid.isEmpty()) {

diff --git a/src/main/java/mekanism/client/gui/robit/GuiRobitMain.java b/src/main/java/mekanism/client/gui/robit/GuiRobitMain.java
@@ -79,7 +79,7 @@ protected void addGuiElements() {
     protected void drawForegroundText(@Nonnull MatrixStack matrix, int mouseX, int mouseY) {
         drawString(matrix, MekanismLang.ROBIT.translate(), titleLabelX, titleLabelY, titleTextColor());
         drawTextScaledBound(matrix, MekanismLang.ROBIT_GREETING.translate(robit.getName()), 29, 18, screenTextColor(), 119);
-        drawTextScaledBound(matrix, MekanismLang.ENERGY.translate(EnergyDisplay.of(robit.getEnergyContainer().getEnergy(), robit.getEnergyContainer().getMaxEnergy())), 29, 36 - 4, screenTextColor(), 119);
+        drawTextScaledBound(matrix, MekanismLang.ENERGY.translate(EnergyDisplay.of(robit.getEnergyContainer())), 29, 36 - 4, screenTextColor(), 119);
         drawTextScaledBound(matrix, MekanismLang.ROBIT_FOLLOWING.translate(robit.getFollowing()), 29, 45 - 4, screenTextColor(), 119);
         drawTextScaledBound(matrix, MekanismLang.ROBIT_DROP_PICKUP.translate(robit.getDropPickup()), 29, 54 - 4, screenTextColor(), 119);
         CharSequence owner = robit.getOwnerName().length() > 14 ? robit.getOwnerName().subSequence(0, 14) : robit.getOwnerName();