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

[WIP] 1.20.1 - Conduit Overhaul: API, Upgrades and Filters #693

Merged
Rover656 merged 14 commits from lts-backport/660-conduit-overhaul into lts/1.20.1 2024-06-22 13:06:27 +00:00
Conversation 4 Commits 14 Files changed 302 +7941 -2192
Rover656 commented 2024-06-20 19:05:04 +00:00 (Migrated from github.com)
Copy link

Description

Backporting #660 to 1.20.1. Skipping serialization changes to avoid breaking existing save games.

Work in progress, this PR is here for tracking.

TODO

  • Complete backport
  • Backport Mekanism conduits
  • Test with existing saves
  • Fix filter config sync
  • Add filter recipes

Breaking Changes

This PR breaks all conduit APIs.

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 Backporting #660 to 1.20.1. Skipping serialization changes to avoid breaking existing save games. Work in progress, this PR is here for tracking. # TODO - [x] Complete backport - [x] Backport Mekanism conduits - [x] Test with existing saves - [x] Fix filter config sync - [x] Add filter recipes # Breaking Changes This PR breaks all conduit APIs. <!-- For drafts, fill this in as you go; if you are leaving draft, make sure these are all complete. --> # Checklist - [x] My code follows the style guidelines of this project (.editorconfig, most IDEs will use this for you). - [x] I have made corresponding changes to the documentation. - [x] 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 -->
github-actions[bot] (Migrated from github.com) reviewed 2024-06-21 20:41:12 +00:00
src/api/java/com/enderio/api/registry/EnderIORegistries.java
@ -0,0 +1,16 @@
package com.enderio.api.registry;
github-actions[bot] (Migrated from github.com) commented 2024-06-21 20:41:12 +00:00
Copy link

🚫 [checkstyle] <com.puppycrawl.tools.checkstyle.checks.javadoc.JavadocPackageCheck> reported by reviewdog 🐶
Missing package-info.java file.

🚫 **[checkstyle]** <com.puppycrawl.tools.checkstyle.checks.javadoc.JavadocPackageCheck> <sub>reported by [reviewdog](https://github.com/reviewdog/reviewdog) :dog:</sub><br>Missing package-info.java file.
src/conduits/java/com/enderio/conduits/common/conduit/block/ConduitBlockEntity.java
@ -0,0 +396,4 @@
}
}
public void updateShape() {
github-actions[bot] (Migrated from github.com) commented 2024-06-21 20:41:12 +00:00
Copy link

🚫 [checkstyle] <com.puppycrawl.tools.checkstyle.checks.coding.EmptyStatementCheck> reported by reviewdog 🐶
Empty statement.

🚫 **[checkstyle]** <com.puppycrawl.tools.checkstyle.checks.coding.EmptyStatementCheck> <sub>reported by [reviewdog](https://github.com/reviewdog/reviewdog) :dog:</sub><br>Empty statement.
github-actions[bot] (Migrated from github.com) reviewed 2024-06-21 23:05:02 +00:00
src/conduits/java/com/enderio/conduits/common/capability/ExtractionSpeedUpgrade.java
@ -0,0 +1,15 @@
package com.enderio.conduits.common.capability;
github-actions[bot] (Migrated from github.com) commented 2024-06-21 23:05:02 +00:00
Copy link

🚫 [checkstyle] <com.puppycrawl.tools.checkstyle.checks.javadoc.JavadocPackageCheck> reported by reviewdog 🐶
Missing package-info.java file.

🚫 **[checkstyle]** <com.puppycrawl.tools.checkstyle.checks.javadoc.JavadocPackageCheck> <sub>reported by [reviewdog](https://github.com/reviewdog/reviewdog) :dog:</sub><br>Missing package-info.java file.
src/conduits/java/com/enderio/conduits/common/conduit/upgrade/SpeedUpgradeItem.java
@ -0,0 +1,37 @@
package com.enderio.conduits.common.conduit.upgrade;
github-actions[bot] (Migrated from github.com) commented 2024-06-21 23:05:02 +00:00
Copy link

🚫 [checkstyle] <com.puppycrawl.tools.checkstyle.checks.blocks.NeedBracesCheck> reported by reviewdog 🐶
'if' construct must use '{}'s.

🚫 **[checkstyle]** <com.puppycrawl.tools.checkstyle.checks.blocks.NeedBracesCheck> <sub>reported by [reviewdog](https://github.com/reviewdog/reviewdog) :dog:</sub><br>'if' construct must use '{}'s.
github-actions[bot] (Migrated from github.com) reviewed 2024-06-22 10:45:23 +00:00
src/conduits/java/com/enderio/conduits/common/integrations/mekanism/ChemicalConduitData.java
@ -0,0 +1,75 @@
package com.enderio.conduits.common.integrations.mekanism;
github-actions[bot] (Migrated from github.com) commented 2024-06-22 10:45:23 +00:00
Copy link

🚫 [checkstyle] <com.puppycrawl.tools.checkstyle.checks.blocks.LeftCurlyCheck> reported by reviewdog 🐶
'{' at column 57 should have line break after.

🚫 **[checkstyle]** <com.puppycrawl.tools.checkstyle.checks.blocks.LeftCurlyCheck> <sub>reported by [reviewdog](https://github.com/reviewdog/reviewdog) :dog:</sub><br>'{' at column 57 should have line break after.
Rover656 commented 2024-06-22 13:05:10 +00:00 (Migrated from github.com)
Copy link

Serialization has not changed in any damaging way - I still need to make more modifications to the redstone filters before releasing 6.1, but this PR has run its course

Serialization has not changed in any damaging way - ~~I still need to make more modifications to the redstone filters before releasing 6.1, but~~ this PR has run its course
Sign in to join this conversation.
Reviewers
No reviewers
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#693
No description provided.
Delete branch "lts-backport/660-conduit-overhaul"

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?