Feature: Infinity Water Cell, Energy Card, Q Bridge Card, FDisplay Potion Support, uTerm Auto Stock and Network packet fix #189

asdflj · 2024-01-02T20:14:56Z

add energy card
add quantum bridge card
fluid terminal display potion effect support
all terminal add data sync button
ultra terminal add automatic stock item
add infinity water cell
add infinity lava cell
network packet add gzip support
fix terminal sometime drop network packet

before	after

add energy card add quantum bridge card fluid terminal display potion effect support all terminal add data sync button ultra terminal add automatic stock item

fix terminal sometime drop network packet

Ethryan · 2024-01-04T10:06:47Z

Just so the name isn't just feature.

add infinity lava cell

Laiff · 2024-01-04T10:27:25Z

@asdflj Please stop force-push branch. When it in draft mode its fine but now it is very harmful to understand what was happened in this force push. And broke review that in progress

src/main/java/com/glodblock/github/client/gui/base/FCBaseMEGui.java

Laiff · 2024-01-04T10:16:22Z

src/main/java/com/glodblock/github/client/gui/widget/FCGuiBaseButton.java

+            this.drawTexturedModalRect(this.xPosition, this.yPosition, 0, 46 + k * 20, this.width / 2, this.height);
+            this.drawTexturedModalRect(
+                    this.xPosition + this.width / 2,
+                    this.yPosition,
+                    200 - this.width / 2,
+                    46 + k * 20,
+                    this.width / 2,
+                    this.height - 2);
+            this.drawTexturedModalRect(
+                    this.xPosition + 2,
+                    this.yPosition + (this.height - 2),
+                    200 - (this.width - 2),
+                    64 + k * 20,
+                    this.width - 2,
+                    2);
+            this.drawTexturedModalRect(
+                    this.xPosition,
+                    this.yPosition + (this.height - 1),
+                    200 - this.width,
+                    65 + k * 20,
+                    this.width,
+                    1);
+            this.mouseDragged(mc, mouseX, mouseY);


Magic numbers

src/main/java/com/glodblock/github/client/gui/GuiFluidMonitor.java

Laiff · 2024-01-04T10:20:34Z

src/main/java/com/glodblock/github/client/gui/GuiMagnet.java

+        super.initGui();
+        this.buttonList.clear();
+
+        this.buttonList.add(


same as in other split and use constants instead of magic numbers

src/main/java/com/glodblock/github/client/gui/GuiMagnet.java

chochem

Please add a lot more details for the added features (what do they do, how do they work, are there recipes, what is the proposed tiering), so that they can be discussed. (Ideally discussion should have been pre-PR)
Also it would be best if you make the bug fixes a separate PR.

Laiff

Overall interesting addition but it needs to be well documented and discussed, can you fill a proposal issue in main modpack issues with detailed explanation what why and how it works.
Also it would be great if you propose tiering for this items and possible gregified recipes.

src/main/java/com/glodblock/github/client/gui/GuiMagnet.java

src/main/java/com/glodblock/github/common/Config.java

src/main/java/com/glodblock/github/common/item/ItemInfinityLavaStorageCell.java

src/main/java/com/glodblock/github/loader/recipe/WirelessTerminalInfinityBoosterRecipe.java

src/main/java/com/glodblock/github/loader/ItemAndBlockHolder.java

Laiff · 2024-01-04T11:26:35Z

src/main/java/com/glodblock/github/proxy/CommonProxy.java

+    @SubscribeEvent
+    public void pickupEvent(EntityItemPickupEvent e) {
+        try {
+            if (Platform.isClient() || e.entityPlayer == null) return;


This logic should be tested with magnet from draconic, only one should pick up items and do not produce duplicates

src/main/java/com/glodblock/github/proxy/CommonProxy.java

src/main/java/com/glodblock/github/util/Util.java

asdflj · 2024-01-10T08:08:05Z

can we just merge it?

Dream-Master · 2024-01-10T08:35:21Z

@Laiff

Laiff · 2024-01-11T08:53:58Z

What do you mean migrate? Move branch into base repository and finish it there or something else?

chochem · 2024-01-11T11:15:47Z

I dont know why you ask for a re-review, Dream. the author has not replied to anything yet.

They also continue to force-push after being asked to not do so :(

asdflj · 2024-01-11T14:02:36Z

What do you mean migrate? Move branch into base repository and finish it there or something else?

merge

Hikari1nVoid · 2024-01-12T08:10:28Z

This is incomplete and should not be merged at all.No docs about new cells regarding tiers,recipes,etc..

boubou19 · 2024-03-10T22:35:02Z

@asdflj i'm afraid without any documentation and related ticket to discuss the balance we will never accept this PR.

Caedis · 2024-03-10T22:42:46Z

honestly each thing should be in their own PR instead of all in one big one.

Dream-Master · 2024-03-10T23:21:00Z

@Laiff said he will rework it when he got time

hold the shift to stop sort items

429687a

asdflj force-pushed the master branch from 1e0238b to 2da199c Compare January 2, 2024 20:33

asdflj marked this pull request as ready for review January 2, 2024 20:35

asdflj force-pushed the master branch from a3e0691 to 03b60a1 Compare January 3, 2024 06:35

asdflj marked this pull request as draft January 3, 2024 11:46

asdflj force-pushed the master branch from d9a7348 to 7261416 Compare January 3, 2024 14:33

add magnet card

8331159

add energy card add quantum bridge card fluid terminal display potion effect support all terminal add data sync button ultra terminal add automatic stock item

asdflj force-pushed the master branch from 7261416 to 8331159 Compare January 3, 2024 14:34

Merge branch 'master' into master

158703b

asdflj marked this pull request as ready for review January 3, 2024 14:41

Dream-Master requested review from Laiff and a team January 3, 2024 18:46

zy added 2 commits January 4, 2024 14:41

add gzip support

6b7c538

fix terminal sometime drop network packet

Merge remote-tracking branch 'origin/master'

d2c6455

Ethryan changed the title ~~Feature~~ Feature: Energy Card, Q Bridge Card, FDisplay Potion Support, uTerm Auto Stock and Network packet fix Jan 4, 2024

add infinity water cell

2c005e1

add infinity lava cell

asdflj force-pushed the master branch from 500222e to 2c005e1 Compare January 4, 2024 10:21

asdflj changed the title ~~Feature: Energy Card, Q Bridge Card, FDisplay Potion Support, uTerm Auto Stock and Network packet fix~~ Feature: Infinity Water Cell, Energy Card, Q Bridge Card, FDisplay Potion Support, uTerm Auto Stock and Network packet fix Jan 4, 2024

Laiff requested changes Jan 4, 2024

View reviewed changes

chochem added the affects balance requires admin approval label Jan 4, 2024

chochem requested changes Jan 4, 2024

View reviewed changes

Laiff requested changes Jan 4, 2024

View reviewed changes

update code style

1e6ed66

asdflj force-pushed the master branch from 9a2007a to 1e6ed66 Compare January 4, 2024 15:57

Dream-Master requested review from Laiff and chochem January 4, 2024 20:34

asdflj force-pushed the master branch 2 times, most recently from 7912a35 to a0d0b75 Compare January 8, 2024 15:57

update code style

453147f

asdflj force-pushed the master branch from a0d0b75 to 453147f Compare January 8, 2024 16:05

boubou19 mentioned this pull request Mar 10, 2024

todo list for 2.6.0 GTNewHorizons/GT-New-Horizons-Modpack#15690

Closed

Dream-Master added ongoing freeze - don't merge Not just a bug fix and thus affected by a current freeze for a upcoming version and removed ongoing freeze - don't merge Not just a bug fix and thus affected by a current freeze for a upcoming version labels Apr 28, 2024

Quetz4l mentioned this pull request Jun 5, 2024

add energy and quantum bridge cards #210

Merged

Quetz4l mentioned this pull request Jun 19, 2024

add infinity water cell #212

Merged

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Feature: Infinity Water Cell, Energy Card, Q Bridge Card, FDisplay Potion Support, uTerm Auto Stock and Network packet fix #189

Feature: Infinity Water Cell, Energy Card, Q Bridge Card, FDisplay Potion Support, uTerm Auto Stock and Network packet fix #189

asdflj commented Jan 2, 2024 •

edited

Loading

Ethryan commented Jan 4, 2024

Laiff commented Jan 4, 2024 •

edited

Loading

Laiff Jan 4, 2024

Laiff Jan 4, 2024

chochem left a comment

Laiff left a comment

Laiff Jan 4, 2024

asdflj commented Jan 10, 2024 •

edited

Loading

Dream-Master commented Jan 10, 2024

Laiff commented Jan 11, 2024

chochem commented Jan 11, 2024

asdflj commented Jan 11, 2024

Hikari1nVoid commented Jan 12, 2024

boubou19 commented Mar 10, 2024

Caedis commented Mar 10, 2024 •

edited

Loading

Dream-Master commented Mar 10, 2024

Feature: Infinity Water Cell, Energy Card, Q Bridge Card, FDisplay Potion Support, uTerm Auto Stock and Network packet fix #189

Are you sure you want to change the base?

Feature: Infinity Water Cell, Energy Card, Q Bridge Card, FDisplay Potion Support, uTerm Auto Stock and Network packet fix #189

Conversation

asdflj commented Jan 2, 2024 • edited Loading

Ethryan commented Jan 4, 2024

Laiff commented Jan 4, 2024 • edited Loading

Laiff Jan 4, 2024

Choose a reason for hiding this comment

Laiff Jan 4, 2024

Choose a reason for hiding this comment

chochem left a comment

Choose a reason for hiding this comment

Laiff left a comment

Choose a reason for hiding this comment

Laiff Jan 4, 2024

Choose a reason for hiding this comment

asdflj commented Jan 10, 2024 • edited Loading

Dream-Master commented Jan 10, 2024

Laiff commented Jan 11, 2024

chochem commented Jan 11, 2024

asdflj commented Jan 11, 2024

Hikari1nVoid commented Jan 12, 2024

boubou19 commented Mar 10, 2024

Caedis commented Mar 10, 2024 • edited Loading

Dream-Master commented Mar 10, 2024

asdflj commented Jan 2, 2024 •

edited

Loading

Laiff commented Jan 4, 2024 •

edited

Loading

asdflj commented Jan 10, 2024 •

edited

Loading

Caedis commented Mar 10, 2024 •

edited

Loading