Merge Multiloader into dev #2639
Merged
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
- Fabric Block Entity Render Data currently removed - Forge alternative also incomplete
Co-authored-by: Technici4n <[email protected]> Co-authored-by: PepperCode1 <[email protected]>
This slightly reduces performance but has more explicit hooks. Mods can now inject into ModelPart.Cube and still render things.
…C#2617) Co-authored-by: mcrcortex <[email protected]>
* Fix delay with FREX Flawless Frames due to dependency between building & visibility * Add iteration limit based on renderDistance
) * fix issue CaffeineMC#2591 by ignoring null driver names * add nullable annotation
…C#2615) * Fix active option slider labels showing unformatted values * Fix option names not being truncated due to incorrect reported slider width
Co-authored-by: mcrcortex <{ID}+{username}@users.noreply.github.com>
# Conflicts: # build.gradle.kts # common/src/main/java/net/caffeinemc/mods/sodium/client/render/immediate/CloudRenderer.java # common/src/main/java/net/caffeinemc/mods/sodium/client/render/vertex/VertexFormatDescriptionImpl.java # common/src/main/java/net/caffeinemc/mods/sodium/mixin/core/render/immediate/consumer/EntityOutlineGeneratorMixin.java # common/src/main/java/net/caffeinemc/mods/sodium/mixin/core/render/world/LevelRendererMixin.java # common/src/main/java/net/caffeinemc/mods/sodium/mixin/features/gui/screen/LevelLoadingScreenMixin.java # common/src/main/java/net/caffeinemc/mods/sodium/mixin/features/render/immediate/buffer_builder/sorting/MeshDataMixin.java # common/src/workarounds/java/net/caffeinemc/mods/sodium/client/platform/MessageBox.java # fabric/src/main/java/net/caffeinemc/mods/sodium/fabric/texture/SpriteFinderCache.java # src/main/java/net/caffeinemc/mods/sodium/client/render/chunk/compile/buffers/ChunkVertexConsumer.java # src/main/java/net/caffeinemc/mods/sodium/mixin/core/render/immediate/consumer/BufferBuilderMixin.java # src/main/java/net/caffeinemc/mods/sodium/mixin/features/render/entity/ModelPartMixin.java # src/main/java/net/caffeinemc/mods/sodium/mixin/features/render/entity/cull/EntityRendererMixin.java # src/main/java/net/caffeinemc/mods/sodium/mixin/features/render/particle/SingleQuadParticleMixin.java # src/main/resources/fabric.mod.json
This reverts commit 6fad4e3be04042d44a04e74085c3a498c1109b1a.
jellysquid3
requested changes
Aug 7, 2024
...n/java/net/caffeinemc/mods/sodium/neoforge/mixin/features/model/WeightedBakedModelMixin.java
Show resolved
Hide resolved
.../src/main/java/net/caffeinemc/mods/sodium/neoforge/mixin/core/model/quad/BakedQuadMixin.java
Show resolved
Hide resolved
neoforge/src/main/java/net/caffeinemc/mods/sodium/neoforge/mixin/ResourcePackLoaderMixin.java
Show resolved
Hide resolved
common/src/main/java/net/caffeinemc/mods/sodium/client/services/SodiumModelData.java
Show resolved
Hide resolved
common/src/main/java/net/caffeinemc/mods/sodium/client/services/PlatformTextureAccess.java
Outdated
Show resolved
Hide resolved
common/src/main/java/net/caffeinemc/mods/sodium/client/services/PlatformBlockAccess.java
Outdated
Show resolved
Hide resolved
common/src/main/java/net/caffeinemc/mods/sodium/client/services/PlatformBlockAccess.java
Outdated
Show resolved
Hide resolved
common/src/main/java/net/caffeinemc/mods/sodium/client/render/immediate/CloudRenderer.java
Outdated
Show resolved
Hide resolved
.../src/main/java/net/caffeinemc/mods/sodium/client/render/frapi/material/MaterialViewImpl.java
Show resolved
Hide resolved
- Move Flawless Frames integration - Rename and modify many services - Made SpriteFinder independent of Fabric API - Added more explicit interfaces
# Conflicts: # common/src/workarounds/java/net/caffeinemc/mods/sodium/client/compatibility/checks/ModuleScanner.java
jellysquid3
requested changes
Aug 8, 2024
common/src/api/java/net/caffeinemc/mods/sodium/api/util/ColorMixer.java
Outdated
Show resolved
Hide resolved
common/src/api/java/net/caffeinemc/mods/sodium/api/util/NormI8.java
Outdated
Show resolved
Hide resolved
common/src/api/java/net/caffeinemc/mods/sodium/api/math/MatrixHelper.java
Outdated
Show resolved
Hide resolved
common/src/api/java/net/caffeinemc/mods/sodium/api/math/MatrixHelper.java
Show resolved
Hide resolved
common/src/main/java/net/caffeinemc/mods/sodium/client/data/config/MixinConfig.java
Outdated
Show resolved
Hide resolved
common/src/main/java/net/caffeinemc/mods/sodium/client/model/color/DefaultColorProviders.java
Outdated
Show resolved
Hide resolved
common/src/main/java/net/caffeinemc/mods/sodium/client/model/color/DefaultColorProviders.java
Outdated
Show resolved
Hide resolved
common/src/main/java/net/caffeinemc/mods/sodium/client/model/light/LightPipeline.java
Outdated
Show resolved
Hide resolved
jellysquid3
approved these changes
Aug 8, 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.
take two