Backport changes from 1.21.1 #265
Merged
+659
−335
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
PepperCode1
requested changes
Oct 12, 2024
buildSrc/src/main/kotlin/dev/engine_room/gradle/transitive/TransitiveSourceSetsExtension.kt
Show resolved
Hide resolved
common/src/main/java/dev/engine_room/flywheel/impl/compat/SodiumCompat.java
Outdated
Show resolved
Hide resolved
common/src/main/java/dev/engine_room/flywheel/impl/mixin/BlockEntityTypeMixin.java
Show resolved
Hide resolved
forge/src/main/java/dev/engine_room/flywheel/impl/FlywheelForge.java
Outdated
Show resolved
Hide resolved
Jozufozu
reviewed
Oct 14, 2024
...e/src/main/java/dev/engine_room/flywheel/impl/mixin/sodium/ChunkBuilderMeshingTaskMixin.java
Outdated
Show resolved
Hide resolved
- Add "stub" sourceset to each subproject - Directly pass vararg sourcesets to methods in PlatformExtension to avoid automatically shipping jars with the api stubs - We may have to include stubs in setupLoomMod, but I don't think so - A lot of this can be stripped back out if we don't need stub sources for the forge/fabric subprojects
- Add Sodium 0.6 and Iris API stubs to stubs source set and remove Gradle dependencies on local Sodium jar, Iris, and Oculus - Ensure usage of APIs that may not exist at runtime is in private classes and access is always guarded - Change ShadersModHandler - Rename to ShadersModHelper - Convert methods to check for Iris' and Optifine's presence into static final fields - Move implementation to impl source set in form of IrisCompat and OptifineCompat classes - Rename CompatMods to CompatMod and add public field to access mod ID - Set BlockEntityType's Sodium predicate to null after it is removed - Update repository links - Remove local libs repository
PepperCode1
approved these changes
Oct 19, 2024
Jozufozu
approved these changes
Oct 19, 2024
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
No description provided.