Team-EnderIO/EnderIO
1
0
Fork 0
Code Issues 114 Pull requests 13 Projects Releases 79 Packages Wiki Activity Actions

PneumaticCraft Pressure Conduits #849

Open
ferriarnus wants to merge 3 commits from ferriarnus/pressure into dev/1.21.1
pull from: ferriarnus/pressure
merge into: Team-EnderIO:dev/1.21.1
Conversation 1 Commits 3 Files changed 26 +870 -3
ferriarnus commented 2024-10-04 16:03:09 +00:00 (Migrated from github.com)
Copy link

Description

Pressure conduits for PneumaticCraft.

TODO

  • Textures
  • Tests

Breaking Changes

List any breaking changes in this section, such as: changed/removed APIs, changed or removed items/blocks or modifications to recipes and gameplay mechanics.

Checklist

  • My code follows the style guidelines of this project (.editorconfig, most IDEs will use this for you).
  • I have made corresponding changes to the documentation.
  • My changes are ready for review from a contributor.
# Description Pressure conduits for PneumaticCraft. <!-- If you're submitting a Draft PR, consider providing a TODO list using checkboxes --> # TODO - [ ] Textures - [ ] Tests # Breaking Changes List any breaking changes in this section, such as: changed/removed APIs, changed or removed items/blocks or modifications to recipes and gameplay mechanics. <!-- For drafts, fill this in as you go; if you are leaving draft, make sure these are all complete. --> # Checklist - [ ] My code follows the style guidelines of this project (.editorconfig, most IDEs will use this for you). - [ ] I have made corresponding changes to the documentation. - [ ] My changes are ready for review from a contributor. <!-- Thanks to: https://embeddedartistry.com/blog/2017/08/04/a-github-pull-request-template-for-your-projects/ for the building blocks of this template -->
Rover656 (Migrated from github.com) requested changes 2024-10-05 23:01:20 +00:00
Rover656 (Migrated from github.com) left a comment
Copy link

Just a handful of code style comments. After a quick pass the conduit code looks good and I'll test it in game another day -but- I have a question about the air context. When a conduit graph is split in half, there's going to be no loss of air and they'll both become over-pressure. Is there any way we can make the air drop and balance between the two graphs?

This of course hasn't been done by the energy conduits because they just clamp the storage back down to the capacity - this might be a case where the changes I was going to propose to Graph Lib could come in handy to properly split the resource across the two contexts.

Just a handful of code style comments. After a quick pass the conduit code looks good and I'll test it in game another day -but- I have a question about the air context. When a conduit graph is split in half, there's going to be no loss of air and they'll both become over-pressure. Is there any way we can make the air drop and balance between the two graphs? This of course hasn't been done by the energy conduits because they just clamp the storage back down to the capacity - this might be a case where the changes I was going to propose to Graph Lib could come in handy to properly split the resource across the two contexts.
enderio-conduits-modded/src/main/java/com/enderio/modconduits/mods/pneumaticcraft/PressureConduit.java
@ -0,0 +86,4 @@
}
if (otherConduit.value() instanceof PressureConduit other) {
Rover656 (Migrated from github.com) commented 2024-10-05 22:56:15 +00:00
Copy link

Could you prune this blank space please :)

Could you prune this blank space please :)
enderio-conduits-modded/src/main/java/com/enderio/modconduits/mods/pneumaticcraft/PressureConduitStorage.java
@ -0,0 +16,4 @@
import java.util.List;
public record PressureConduitStorage(PressureTier tier, ConduitNode node) implements IAirHandlerMachine {
Rover656 (Migrated from github.com) commented 2024-10-05 22:57:04 +00:00
Copy link

Another line here please (auto-formatting PR soon ™️)

Another line here please (auto-formatting PR soon :tm:)
enderio-conduits/src/main/java/com/enderio/conduits/common/conduit/type/fluid/FluidConduit.java
@ -108,1 +80,3 @@
return !isMultiFluid();
public boolean canConnectTo(ConduitNode selfNode, ConduitNode otherNode) {
FluidConduitData selfData = selfNode.getOrCreateData(ConduitTypes.Data.FLUID.get());
FluidConduitData otherData = otherNode.getOrCreateData(ConduitTypes.Data.FLUID.get());
Rover656 (Migrated from github.com) commented 2024-10-05 22:59:09 +00:00
Copy link

Could we lift the fluid conduit fixes into a different PR, currently fluid conduits are completely borked and it'd be good to handle these separately 😅

Could we lift the fluid conduit fixes into a different PR, currently fluid conduits are completely borked and it'd be good to handle these separately 😅
gradle.properties
@ -5,3 +5,3 @@
# Minecraft and NeoForge
minecraftVersion=1.21.1
neoForgeVersion=21.1.181
neoForgeVersion=21.1.60
Rover656 (Migrated from github.com) commented 2024-10-05 22:58:31 +00:00
Copy link

Did we bump because .60 is required for Ender IO, or for Pneumaticraft?

Did we bump because .60 is required for Ender IO, or for Pneumaticraft?
This pull request has changes conflicting with the target branch.
  • buildSrc/shared.gradle.kts
  • enderio-conduits-modded/build.gradle.kts
  • enderio-conduits-modded/src/main/java/com/enderio/modconduits/ModdedConduits.java
  • enderio-modded-conduits/src/generated/resources/assets/enderio/lang/en_us.json
  • enderio-modded-conduits/src/generated/resources/data/enderio/advancement/recipes/building_blocks/pnc_advanced_pressure_tube.json
  • enderio-modded-conduits/src/generated/resources/data/enderio/advancement/recipes/building_blocks/pnc_pressure_tube.json
  • enderio-modded-conduits/src/generated/resources/data/enderio/advancement/recipes/building_blocks/pnc_reinforced_pressure_tube.json
  • enderio-modded-conduits/src/generated/resources/data/enderio/enderio/conduit/advanced_pressure.json
  • enderio-modded-conduits/src/generated/resources/data/enderio/enderio/conduit/basic_pressure.json
  • enderio-modded-conduits/src/generated/resources/data/enderio/enderio/conduit/reinforced_pressure.json
  • enderio-modded-conduits/src/generated/resources/data/enderio/recipe/pnc_advanced_pressure_tube.json
  • enderio-modded-conduits/src/generated/resources/data/enderio/recipe/pnc_pressure_tube.json
  • enderio-modded-conduits/src/generated/resources/data/enderio/recipe/pnc_reinforced_pressure_tube.json
  • enderio-modded-conduits/src/main/resources/assets/enderio/textures/block/conduit/advanced_pressure.png
  • enderio-modded-conduits/src/main/resources/assets/enderio/textures/block/conduit/basic_pressure.png
  • enderio-modded-conduits/src/main/resources/assets/enderio/textures/block/conduit/reinforced_pressure.png
  • enderio-modded-conduits/src/main/resources/assets/enderio/textures/gui/sprites/conduit_icon/advanced_pressure.png
  • enderio-modded-conduits/src/main/resources/assets/enderio/textures/gui/sprites/conduit_icon/basic_pressure.png
  • enderio-modded-conduits/src/main/resources/assets/enderio/textures/gui/sprites/conduit_icon/reinforced_pressure.png
  • gradle.properties
View command line instructions

Checkout

From your project repository, check out a new branch and test the changes.
git fetch -u origin ferriarnus/pressure:ferriarnus/pressure
git switch ferriarnus/pressure

Merge

Merge the changes and update on Forgejo.

Warning: The "Autodetect manual merge" setting is not enabled for this repository, you will have to mark this pull request as manually merged afterwards.

git switch dev/1.21.1
git merge --no-ff ferriarnus/pressure
git switch ferriarnus/pressure
git rebase dev/1.21.1
git switch dev/1.21.1
git merge --ff-only ferriarnus/pressure
git switch ferriarnus/pressure
git rebase dev/1.21.1
git switch dev/1.21.1
git merge --no-ff ferriarnus/pressure
git switch dev/1.21.1
git merge --squash ferriarnus/pressure
git switch dev/1.21.1
git merge --ff-only ferriarnus/pressure
git switch dev/1.21.1
git merge ferriarnus/pressure
git push origin dev/1.21.1
Sign in to join this conversation.
Reviewers
No reviewers
Rover656
Labels
Clear labels   
Area-Assets

   
Area-Backend

Backend work not usually visible to players.

  
Area-Conduits

Everything involving conduits

  
Area-Datapacks

   
Area-Lang

   
Area-Mod Compat

   
Area-Parity

1.12.2 missing features

  
Area-Rendering

Rendering code, might be shaders specific or general.

  
Good first issue

   
MC-1.19.2

   
MC-1.20.1

   
MC-1.20.4

   
MC-1.20.6

   
MC-1.21

   
MC-1.21.1

   
Modtoberfest

   
P-0-High

High priority, crash/breaking.

  
P-1-Medium

Medium priority. Potentially deleting items or breaking functionality.

  
P-2-Low

Low priority. Not hurting anyone, just annoying.

  
Status-Awaiting Response

Waiting for OP to respond

  
Status-Behind-Flag

This change is available but is placed behind a feature flag.

  
Status-Blocked

Blocked by a specific issue or protocol.

  
Status-Cannot Reproduce

   
Status-Duplicate

This issue or pull request already exists

  
Status-Help Wanted

We need some help to try and track this thing down..

  
Status-Incomplete Report

   
Status-Invalid

This doesn't seem right

  
Status-Needs LTS Backport

Fixed in latest but requires LTS backport.

  
Status-Needs Updating

Needs updating to a newer Minecraft version.

  
Status-Stale

This may not be updated by the OP any further.

  
Status-To Implement

   
Status-Triage

A Triage Member should take a look at this

  
Status-Wontfix

This will not be worked on

  
Status-Wontmerge

This PR won't be merged, but is left now for reference of ongoing or future works.

  
Type-Backport

   
Type-Bug

There is a problem.

  
Type-Documentation

Improvements or additions to documentation

  
Type-Enhancement

New feature or enhancement to existing feature.

  
Type-Question

Further information is requested

  
Type-RFC

Request for comments.

  
Type-Suggestion
No labels
Area-Assets
Area-Backend
Area-Conduits
Area-Datapacks
Area-Lang
Area-Mod Compat
Area-Parity
Area-Rendering
Good first issue
MC-1.19.2
MC-1.20.1
MC-1.20.4
MC-1.20.6
MC-1.21
MC-1.21.1
Modtoberfest
P-0-High
P-1-Medium
P-2-Low
Status-Awaiting Response
Status-Behind-Flag
Status-Blocked
Status-Cannot Reproduce
Status-Duplicate
Status-Help Wanted
Status-Incomplete Report
Status-Invalid
Status-Needs LTS Backport
Status-Needs Updating
Status-Stale
Status-To Implement
Status-Triage
Status-Wontfix
Status-Wontmerge
Type-Backport
Type-Bug
Type-Documentation
Type-Enhancement
Type-Question
Type-RFC
Type-Suggestion
Milestone
Clear milestone
No items
No milestone
Projects
Clear projects
No items
No project
Assignees
Clear assignees
No assignees
1 participant
Notifications
Due date
The due date is invalid or out of range. Please use the format "yyyy-mm-dd".

No due date set.

Dependencies

No dependencies set.

Reference: Team-EnderIO/EnderIO#849
No description provided.
Delete branch "ferriarnus/pressure"

Deleting a branch is permanent. Although the deleted branch may continue to exist for a short time before it actually gets removed, it CANNOT be undone in most cases. Continue?