Skip to content
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

Port to 1.21.1 #679

Merged
merged 61 commits into from
Jan 15, 2025
Merged

Port to 1.21.1 #679

merged 61 commits into from
Jan 15, 2025

Conversation

SirEndii
Copy link
Member

@SirEndii SirEndii commented Jan 4, 2025 •
edited
Loading

Initial port work to 1.21.1

TODO:

  • Drop Refined Storage support, support RS2 - Not mandatory for now
  • Re-Support the colony integrator, it was removed in 1.20.4 since minecolonies does not exist in that version
  • networking - Thanks to @CrazyDev05
  • Item and Fluid filters nbt/data filtering
  • Pocket data generators dont work

But I have a major issue understanding the new data component system. Especially for the ClockwiseAnimatedTurtleUpgrade, I am not sure how I am supposed to port. But I guess I need to find out.

SirEndii and others added 17 commits December 24, 2024 03:30
@SirEndii
Initial 1.21.1 work, just adapted gradle
4f28b03
@SirEndii
Merge branch 'dev/1.20.4' into dev/1.21.1
2918893 
# Conflicts:
#	build.gradle
@SirEndii
Merge branch 'dev/1.20.4' into dev/1.21.1
4e3968d
@SirEndii
Merge branch 'release/1.20.4' into dev/1.21.1
5993f6a 
# Conflicts:
#	gradle.properties
Update 1.21 config file
34c1fe4
Update 1.21 config file
4879a60
Update 1.21 Registry
1fafc44
Update 1.21 EventBusSubscriber
65423e4
Update 1.21 ResourceLocation
05f9a94
Update 1.21 ChunkManager
a35acfd
Update 1.21 canSleepPlayer function
0b53bab
Update ServerWorker to 1.21
1c1a68d
Update 1.21 VillagerTrade
227f6ec
Update upgrade to 1.21
b2ea619
Update some provider and datagen to 1.21
b2a3496
@diemoell
Replace all ResourceLocation.fromNamespaceAndPath with AdvancedPeriph…
b6f924f 
…erals.getRL
@SirEndii
Merge pull request #677 from diemoell/update/1.21.1_work
0599fed 
Moving towards 1.21 update
@SirEndii SirEndii added the 1.21.1 label Jan 4, 2025
@SirEndii SirEndii added this to the 0.7.x milestone Jan 4, 2025
@SirEndii SirEndii self-assigned this Jan 4, 2025
@SirEndii SirEndii marked this pull request as draft January 4, 2025 20:15
@SirEndii
Copy link
Member Author

SirEndii commented Jan 4, 2025

Adding something to the todo:
Refined storage is gone, but the author creates RS2. So we should eventually support RS2, but this is low priority since RS2 isn't even released on curseforge yet

@zyxkad
Copy link
Collaborator

zyxkad commented Jan 4, 2025

so you wanna port 0.7 to 1.21 as well or only focus on 0.8?

@SirEndii
Copy link
Member Author

SirEndii commented Jan 5, 2025

0.7 for now

If I would wait for 0.8, I would need another year ;p
When I am done with the port, porting 0.8 should not take long since I have already practice and 0.7 where I can look stuff up

@SirEndii
Begone RS Bridge
e3e4554 
Fixed accesstransformers
@SirEndii
Further porting, mostly Data Component work.
ea5dde9 
The stuff that needs the most data component love is now our operation ability system where different operations have different data components that we need to register
@SirEndii
Copy link
Member Author

Almost done with the port, I extended the TODO list
I again need to change the networking stuff

I've managed to understand-ish the data component system but some stuff still needs some love like our ability systems where we need to register data components based on existing abilities

@SirEndii
More component stuff, the project now builds, but it needs extensive …
c9bdf48 
…testing. Some automata stuff needs more data component porting and I still have no clue how we convert data components to a lua tag and vice versa. We need that for blocks like the ME Bridge or the Item and Fluid Filters
@SirEndii SirEndii requested a review from zyxkad January 15, 2025 00:26
@SirEndii SirEndii linked an issue Jan 15, 2025 that may be closed by this pull request
Port to 1.21 NeoForge IntelligenceModding/Advanced-Peripherals-Features#93
Open
zyxkad
zyxkad reviewed Jan 15, 2025
View reviewed changes
CHANGELOG.md Show resolved Hide resolved
zyxkad
zyxkad requested changes Jan 15, 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.

Reviewed a few files 👍

...a/de/srendi/advancedperipherals/common/addons/computercraft/owner/TurtlePeripheralOwner.java Show resolved Hide resolved
...a/de/srendi/advancedperipherals/common/addons/computercraft/peripheral/ColonyPeripheral.java Outdated Show resolved Hide resolved
...a/de/srendi/advancedperipherals/common/addons/computercraft/peripheral/ColonyPeripheral.java Outdated Show resolved Hide resolved
src/main/java/de/srendi/advancedperipherals/common/addons/minecolonies/MineColonies.java Outdated Show resolved Hide resolved
src/main/java/de/srendi/advancedperipherals/common/addons/minecolonies/MineColonies.java Show resolved Hide resolved
src/main/java/de/srendi/advancedperipherals/common/data/EnUsLanguageProvider.java Outdated Show resolved Hide resolved
src/main/java/de/srendi/advancedperipherals/common/data/TurtleUpgradesProvider.java Outdated Show resolved Hide resolved
src/main/java/de/srendi/advancedperipherals/common/items/MemoryCardItem.java Outdated Show resolved Hide resolved
src/main/java/de/srendi/advancedperipherals/common/items/WeakAutomataCore.java Show resolved Hide resolved
src/main/java/de/srendi/advancedperipherals/common/setup/DataComponents.java Outdated Show resolved Hide resolved
@SirEndii
Copy link
Member Author

I need to remember to apply your reviews also for the colony integrator in 0.8

@SirEndii SirEndii requested a review from zyxkad January 15, 2025 02:10
zyxkad
zyxkad requested changes Jan 15, 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.

yep yep

src/main/java/de/srendi/advancedperipherals/common/util/ChunkManager.java Outdated Show resolved Hide resolved
src/main/java/de/srendi/advancedperipherals/common/util/ChunkManager.java Outdated Show resolved Hide resolved
...a/de/srendi/advancedperipherals/common/addons/computercraft/peripheral/ColonyPeripheral.java Outdated Show resolved Hide resolved
...a/de/srendi/advancedperipherals/common/addons/computercraft/peripheral/ColonyPeripheral.java Show resolved Hide resolved
src/main/java/de/srendi/advancedperipherals/common/util/DataStorageUtil.java Outdated Show resolved Hide resolved
src/main/java/de/srendi/advancedperipherals/common/util/LuaConverter.java Outdated Show resolved Hide resolved
src/main/java/de/srendi/advancedperipherals/common/util/ServerWorker.java Outdated Show resolved Hide resolved
@SirEndii SirEndii requested a review from zyxkad January 15, 2025 02:41
zyxkad
zyxkad approved these changes Jan 15, 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.

Well I think it's good now, I'm too tired to do a second round check, so let hope it (and the action) works.

@SirEndii SirEndii merged commit a1777b0 into release/1.21.1 Jan 15, 2025
8 checks passed
@SirEndii SirEndii mentioned this pull request Jan 15, 2025
Open
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@CrazyDev05 CrazyDev05 CrazyDev05 left review comments

@SquidDev SquidDev SquidDev left review comments

@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.

Port to 1.21 NeoForge
5 participants
@SirEndii @zyxkad @CrazyDev05 @SquidDev @diemoell