Skip to content

1.21.1 RS Bridge to RS2 port #684

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom
Merged
merged 96 commits into from
May 6, 2025
Merged

1.21.1 RS Bridge to RS2 port #684

merged 96 commits into from
May 6, 2025
+3,587 −119

Conversation

SirEndii
Copy link
Member

Still needs a description - currently trying to use the new rs2 api to make the RS bridge
Low prio because RS2 isn't released yet

@SirEndii SirEndii added this to the 0.7.x milestone Jan 14, 2025
@SirEndii SirEndii self-assigned this Jan 14, 2025
@SirEndii SirEndii changed the base branch from dev/1.20.1 to dev/1.21.1 January 14, 2025 20:48
@SirEndii SirEndii mentioned this pull request Jan 14, 2025
Closed
@SirEndii
RS Bridge can now connect to a RS System
ddb4d2c
@SirEndii
Use for the RS functions our IStorageSystemPeripheral implementatio…
28be7b8 
…n from 0.8 to reduce breaking changes when we port 0.8 to future versions, we will also use that for the me bridge in the near future

Some functions implemented for testing
@github-actions GitHub Actions
Copy link
Contributor

github-actions bot commented Jan 14, 2025 •
edited
Loading

Build Preview

badge

You can find files attached to the below linked Workflow Run URL (Logs).

Name Link
Commit c31224d
Logs https://github.com/IntelligenceModding/AdvancedPeripherals/actions/runs/14869080353
Jar Files AdvancedPeripherals PR 684
Expires At 2025-08-04T20:27:35Z

SirEndii added 21 commits January 15, 2025 14:30
@SirEndii
Merge branch 'dev/1.21.1' into dev/1.21.1-rs2
15878c7 
# Conflicts:
#	src/generated/resources/.cache/2f719b8031aed5e605ed8d6694b19245ca45c6ca
#	src/generated/resources/.cache/b8526e444ae7356037f3a813274f6835d1f3dd16
#	src/main/java/de/srendi/advancedperipherals/common/data/BlockStatesAndModelsProvider.java
@SirEndii
get and list items functions
7daf848
@SirEndii
Initialize the network node container
9a76fac
@SirEndii
Merge branch 'dev/1.21.1' into dev/1.21.1-rs2
36520b8
@SirEndii
Merge branch 'refs/heads/dev/1.21.1' into dev/1.21.1-rs2
bde4fb4
@SirEndii
listFluids and getFluid
3c04f09 
Bump RS
@SirEndii
Implement listCraftables functions
fcd6ec4
@SirEndii
Add patterns and filtered patterns support
c2643ff
@SirEndii
Implement listDrives and listCells
35b226d
@SirEndii
Implement getStoredEnergy and getEnergyCapacity. Remove `getFilte…
faf98c2 
…redPatterns` and add the filter option to `getPatterns`
@SirEndii
Implement used, total and available storage functions for internal an…
7bb5685 
…d external storages with chemical support
@SirEndii
implement import and export functions
e1bb4c4
@SirEndii
Added peripheral block support and make some inventory and fluid util…
2d4f391 
… methods nullable to support both at once
@SirEndii
Somewhat implemented the craftItems function, but it's not done yet. …
a5ccc5a 
…The items can be requested, but we are currently unable to give the players more information - already in discussion with the rs2 maintainer
@SirEndii
Change order of IStorageSystemPeripheral
b32745d
@SirEndii
Basic chemical support
1413ea6
@SirEndii
Implemented all RS functions - the crafting job needs some love but I…
db4806a 
… fixed that it would not have a crafting task to get information. Now needs major testing and refinement
@SirEndii
more chemical functions
6b3ad98
@SirEndii
Chemical support for listing functions
8740678
@SirEndii
Full chemical support
a4b851b
@SirEndii
More cursed RS2 implementations but the bridge should be completed by…
8e72c63 
… now. We may change some api design before we release the update
@SirEndii SirEndii requested a review from zyxkad April 28, 2025 20:05
SirEndii added 2 commits April 28, 2025 23:52
@SirEndii
Fixed IllegalStateException when trying to get a holder from the regi…
8978dfb 
…stry, before we created a new holder instead of getting one from the registry
@SirEndii
Also return crafting tasks that weren't submitted by the Bridge
f82228c 
Add a crafted and resource attribute to the crafting task object
@SirEndii SirEndii requested a review from zyxkad April 30, 2025 15:24
zyxkad
zyxkad requested changes May 4, 2025
View reviewed changes
Copy link
Collaborator

@zyxkad zyxkad left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

some clean up

SirEndii and others added 2 commits May 4, 2025 20:39
@SirEndii @zyxkad
Update src/main/java/de/srendi/advancedperipherals/common/addons/refi…
42bb7c2 
…nedstorage/RSFluidHandler.java

Co-authored-by: Kevin Z <zyxkad@gmail.com>
Signed-off-by: Srendi <info@denizdemiroglu.de>
@zyxkad
clean up RS insert/extracts
1c9dc39 
Signed-off-by: Kevin Z <zyxkad@gmail.com>
@zyxkad
fix insertChemical
acb51ee 
Signed-off-by: Kevin Z <zyxkad@gmail.com>
zyxkad
zyxkad approved these changes May 5, 2025
View reviewed changes
Copy link
Collaborator

@zyxkad zyxkad left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Everything else looks good, at least for now :p

@SirEndii
Copy link
Member Author

SirEndii commented May 5, 2025

Yeah I will address the two open reviews of you and then merge

@SirEndii SirEndii merged commit 0aa9fb0 into dev/1.21.1 May 6, 2025
8 checks passed
@github-project-automation github-project-automation bot moved this from In Progress to Done in Advanced Peripherals May 6, 2025
@SirEndii SirEndii deleted the dev/1.21.1-rs2 branch May 6, 2025 20:39
@SirEndii SirEndii mentioned this pull request May 10, 2025
Open
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@zyxkad zyxkad zyxkad approved these changes

Assignees

@SirEndii SirEndii

Labels
1.21.1
Projects
Advanced Peripherals
Status: Done
Milestone
0.7.x
Development

Successfully merging this pull request may close these issues.
2 participants
@SirEndii @zyxkad