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

Compatibility with Forge+Bukkit environment #781

Merged
merged 13 commits into from
Jan 6, 2025
Merged

Compatibility with Forge+Bukkit environment #781

merged 13 commits into from
Jan 6, 2025

Conversation

HaHaWTH
Copy link
Contributor

@HaHaWTH HaHaWTH commented Jan 2, 2025

This pull request makes CubicChunks able to run on Forge+Bukkit server environment while keeping normal Forge compatibility.

Changes

  • Split Forge mixins methods to a separate mixin class
  • Add Bukkit side mixins
  • Hybrid environment detection to apply mixins dynamically
  • Include Spigot API dependency for some CraftBukkit method call usages
  • Updated workflow

Barteks2x
Barteks2x requested changes Jan 5, 2025
View reviewed changes
Copy link
Member

@Barteks2x Barteks2x left a comment

Choose a reason for hiding this comment

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

While I'm overall fine with bukkit compat the current provided implementation isn't very maintainable.

I also have some concerns about bukkit API license being GPL, while CC being MIT

src/main/java/io/github/opencubicchunks/cubicchunks/core/util/PlatformCompatUtils.java Outdated Show resolved Hide resolved
...o/github/opencubicchunks/cubicchunks/core/asm/mixin/core/common/MixinWorldServer_Bukkit.java Outdated Show resolved Hide resolved
...hub/opencubicchunks/cubicchunks/core/asm/mixin/core/common/MixinPlayerList_Bukkit_Sided.java Outdated Show resolved Hide resolved
...n/java/io/github/opencubicchunks/cubicchunks/core/asm/mixin/core/common/MixinPlayerList.java Outdated Show resolved Hide resolved
.../java/io/github/opencubicchunks/cubicchunks/core/asm/mixin/core/common/MixinChunk_Cubes.java Outdated Show resolved Hide resolved
...java/io/github/opencubicchunks/cubicchunks/core/asm/mixin/core/common/MixinChunk_Column.java Show resolved Hide resolved
src/main/java/io/github/opencubicchunks/cubicchunks/core/asm/coremod/CubicChunksCoreMod.java Outdated Show resolved Hide resolved
@Barteks2x
Copy link
Member

This also needs vanilla client compatibility tested.

@HaHaWTH
Copy link
Contributor Author

HaHaWTH commented Jan 5, 2025 •
edited
Loading

Tested on Vanilla Forge client and hybrid servers, works fine.

Barteks2x
Barteks2x reviewed Jan 6, 2025
View reviewed changes
Copy link
Member

@Barteks2x Barteks2x left a comment

Choose a reason for hiding this comment

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

One last minor thing - we generally prefer to explain something like this that isn't entirely obvious in comments.

My last remaining concern is license, but other than that looks good. I'm going to accept it once this one comment is added, if licensing ever becomes an issue bukkit support can still be removed.

src/main/java/io/github/opencubicchunks/cubicchunks/core/asm/mixin/core/common/MixinWorld.java Show resolved Hide resolved
@Barteks2x Barteks2x merged commit 2f45b0d into OpenCubicChunks:MC_1.12 Jan 6, 2025
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@Barteks2x Barteks2x Barteks2x approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
2 participants
@HaHaWTH @Barteks2x