Added Buffers (item and power) #455

Trytoon · 2023-08-12T11:27:29Z

Description

I've been absent for a long time now but I've been following your amazing bug fixing adventures...

During this time I worked on buffers (Item + Power) which allows the player to have a 3x3 item buffer and a power buffer that allows the player to control I/O energy rates from the block.

It implements an improved version of the energy textbox widget that I showed you on PR #364 so when this gets in the code base, I will close #364.

I'm not sure about everything in my code as usual so I will be taking your suggestions into consideration :) I've commented that in the code so you will understand what I'm talking about...

Closes #150 , #364

Checklist:

My code follows the style guidelines of this project (.editorconfig, most IDEs will use this for you).
I have performed a self-review of my own code.
I have commented my code in areas it may be challenging to understand.
I have made corresponding changes to the documentation.
My changes are ready for review from a contributor.

dphaldes

Initial review :)

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

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

src/machines/java/com/enderio/machines/client/gui/widget/EnergyTextboxWidget.java

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

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

…into my6.0.11

dphaldes · 2024-01-02T16:02:12Z

src/core/java/com/enderio/core/CoreNBTKeys.java

+    public static final String BUFFER_MAX_INPUT = "BufferMaxInput";
+
+    public static final String BUFFER_MAX_OUTPUT = "BufferMaxOutput";


Use Generic ENERGY_MAX_RECEIVE and ENERGY_MAX_EXTRACT instead.

dphaldes · 2024-01-02T16:07:22Z

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

+
+        builder.push("powerBuffer");
+            POWER_BUFFER_CAPACITY = builder.comment("The base energy capacity in uI.").defineInRange("capacity", 100_000, 1, Integer.MAX_VALUE);
+            POWER_BUFFER_USAGE = builder.comment("The base energy consumption in uI/t.").defineInRange("usage", 1_000, 1, Integer.MAX_VALUE);


Usage/Consumption ?

dphaldes · 2024-01-02T16:19:11Z

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

+        inputDataSlot = new IntegerNetworkDataSlot(this::getMaxInput, input -> maxInput = input);
+        outputDataSlot = new IntegerNetworkDataSlot(this::getMaxOutput, output -> maxOutput = output);
+        addDataSlot(inputDataSlot);
+        addDataSlot(outputDataSlot);
+
+        inputTextDataSlot = new StringNetworkDataSlot(this::getMaxInputText, input -> inputTextValue = input);
+        outputTextDataSlot = new StringNetworkDataSlot(this::getMaxOutputText, output -> outputTextValue = output);


Why are both the value and string form synced separately ?

dphaldes · 2024-01-02T16:20:28Z

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

+    public void setMaxInputText(String maxInputText) {
+        if (level != null && level.isClientSide) {
+            clientUpdateSlot(inputTextDataSlot, maxInputText);
+        } this.inputTextValue = maxInputText;
+    }
+
+    public void setMaxOutputText(String maxOutputText) {
+        if (level != null && level.isClientSide) {
+            clientUpdateSlot(outputTextDataSlot, maxOutputText);
+        } this.outputTextValue = maxOutputText;
+    }


There is no point in syncing the text. It should be completely client sided. The server needs to know only the final Integer.

dphaldes · 2024-01-02T16:25:26Z

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

+                        if (otherHandler.get().canExtract()) {
+                            dirs.add(side);
+                        }
+                    } else {
+                        if (otherHandler.get().canReceive()) {
+                            dirs.add(side);


Will this take care of neighbors being full or empty ?

dphaldes · 2024-01-02T16:27:40Z

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

+                    int received = otherHandler.get().receiveEnergy(Math.min(energyPerSide, getExposedEnergyStorage().getEnergyStored()), false);
+                    // Consume that energy from our buffer.
+                    getExposedEnergyStorage().extractEnergy(received, false);


Shouldn't these be simulated first ?

dphaldes · 2024-01-02T16:43:32Z

src/machines/java/com/enderio/machines/client/gui/widget/EnergyTextboxWidget.java

+    public String formatEnergy(String value) {
+        if (value.isEmpty()) {
+            return "";
+        }
+
+        int energy;
+        value = value.replace(",", "");
+
+        try {
+            energy = Integer.parseInt(value);
+            energy = Math.min(energy, maxEnergy.get());
+        } catch(Exception e) {
+            energy = 0;
+        }
+
+        try {
+            DecimalFormat decimalFormat = (DecimalFormat) NumberFormat.getInstance(Locale.ROOT);
+            decimalFormat.applyPattern("#,###");


Look into EditTextBox#formatter and FormattedSequence. Is that something that should be used instead?

dphaldes · 2024-01-02T16:44:40Z

src/machines/java/com/enderio/machines/client/gui/widget/EnergyTextboxWidget.java

+    public void renderToolTip(GuiGraphics guiGraphics, int mouseX, int mouseY) {
+        if (mouseX >= getX() && mouseX <= getX() + width && mouseY >= getY() && mouseY <= getY() + height && !isFocused() && maxEnergy.get() != 0) {
+            guiGraphics.renderTooltip(displayOn.getMinecraft().font, Component.literal(getValue() +"/" + maxEnergy.get()  +" µI/t"), mouseX, mouseY);
+        }
+    }


Not required anymore

dphaldes · 2024-01-02T16:47:29Z

src/machines/java/com/enderio/machines/client/gui/widget/EnergyTextboxWidget.java

+    @Override
+    public boolean mouseClicked(double mouseX, double mouseY, int button) {
+        if (mouseX >= getX() && mouseX <= getX() + width && mouseY >= getY() && mouseY <= getY() + height) {
+            super.mouseClicked(mouseX, mouseY, button);


Are you sure this mouseClicked result can be ignored?

Rover656 · 2024-05-03T21:00:38Z

Will not be merged into dev/1.20.1 - needs rebasing on 20.4+ to for this :) (I know you're likely busy - I'm writing this for tracking purposes)

Added Buffers (item and power)

ff75272

Trytoon mentioned this pull request Aug 13, 2023

Added an Energy Textbox Widget #364

Closed

5 tasks

dphaldes requested changes Aug 13, 2023

View reviewed changes

Trytoon added 2 commits August 13, 2023 21:55

Fixed buffers not being able to push items

dbdec30

Implemented requested changes + moved I/O update code to the be

43150b8

dphaldes requested changes Aug 14, 2023

View reviewed changes

src/machines/java/com/enderio/machines/client/gui/screen/OmniBufferScreen.java Outdated Show resolved Hide resolved

dphaldes and others added 3 commits August 14, 2023 21:46

switch editBox triggers

a83c9c6

change syncing and only update on change focus

1bb42c4

small tweaks

583c2af

Rover656 added Type-Enhancement New feature or enhancement to existing feature. MC-1.20.1 Area-Parity 1.12.2 missing features labels Sep 5, 2023

Trytoon and others added 7 commits December 25, 2023 18:49

fixed textboxes resetting when resizing screen

82eb60f

Merge branch 'dev/1.20.1' into my6.0.11

4be8067

Merge remote-tracking branch 'upstream/dev/1.20.1' into my6.0.11

7441474

Merge branch 'my6.0.11' of https://github.com/Trytoon/EnderIO-Rewrite …

c8a24cf

…into my6.0.11

fixed UI... now it should compile too :)

c2c3896

I forgot datagen

7c4622b

made buffer output energy equally between sides

081177e

dphaldes requested changes Jan 2, 2024

View reviewed changes

Rover656 added this to the 1.12.2 Parity Features milestone Jun 11, 2024

Rover656 added the Status-Stale This may not be updated by the OP any further. label Jun 29, 2024

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Added Buffers (item and power) #455

Added Buffers (item and power) #455

Trytoon commented Aug 12, 2023

dphaldes left a comment

dphaldes Jan 2, 2024

dphaldes Jan 2, 2024

dphaldes Jan 2, 2024

dphaldes Jan 2, 2024 •

edited

Loading

dphaldes Jan 2, 2024

dphaldes Jan 2, 2024

dphaldes Jan 2, 2024 •

edited

Loading

dphaldes Jan 2, 2024

dphaldes Jan 2, 2024

Rover656 commented May 3, 2024

		public static final String BUFFER_MAX_INPUT = "BufferMaxInput";

		public static final String BUFFER_MAX_OUTPUT = "BufferMaxOutput";

Added Buffers (item and power) #455

Are you sure you want to change the base?

Added Buffers (item and power) #455

Conversation

Trytoon commented Aug 12, 2023

Description

Checklist:

dphaldes left a comment

Choose a reason for hiding this comment

dphaldes Jan 2, 2024

Choose a reason for hiding this comment

dphaldes Jan 2, 2024

Choose a reason for hiding this comment

dphaldes Jan 2, 2024

Choose a reason for hiding this comment

dphaldes Jan 2, 2024 • edited Loading

Choose a reason for hiding this comment

dphaldes Jan 2, 2024

Choose a reason for hiding this comment

dphaldes Jan 2, 2024

Choose a reason for hiding this comment

dphaldes Jan 2, 2024 • edited Loading

Choose a reason for hiding this comment

dphaldes Jan 2, 2024

Choose a reason for hiding this comment

dphaldes Jan 2, 2024

Choose a reason for hiding this comment

Rover656 commented May 3, 2024

dphaldes Jan 2, 2024 •

edited

Loading

dphaldes Jan 2, 2024 •

edited

Loading