Initial port to 26.1.2 - #333
Open
IThundxr wants to merge 78 commits into
Open
Conversation
# Conflicts: # common/src/api/java/dev/engine_room/flywheel/api/material/Material.java # common/src/lib/java/dev/engine_room/flywheel/lib/model/ModelUtil.java # common/src/lib/java/dev/engine_room/flywheel/lib/model/baked/BakedModelBuilder.java # common/src/lib/java/dev/engine_room/flywheel/lib/model/baked/BlockModelBuilder.java # common/src/vanillin/java/dev/engine_room/vanillin/VanillinInstanceTypes.java # common/src/vanillin/java/dev/engine_room/vanillin/item/ItemModelBuilder.java # common/src/vanillin/java/dev/engine_room/vanillin/mixin/text/BakedGlyphMixin.java # common/src/vanillin/java/dev/engine_room/vanillin/mixin/text/FontAccessor.java # common/src/vanillin/java/dev/engine_room/vanillin/mixin/text/FontSetMixin.java # common/src/vanillin/java/dev/engine_room/vanillin/mixin/text/FontTextureMixin.java # common/src/vanillin/java/dev/engine_room/vanillin/text/BakedGlyphExtension.java # common/src/vanillin/java/dev/engine_room/vanillin/text/FontTextureExtension.java # common/src/vanillin/java/dev/engine_room/vanillin/text/SimpleTextLayer.java # common/src/vanillin/java/dev/engine_room/vanillin/text/TextLayer.java # common/src/vanillin/java/dev/engine_room/vanillin/text/TextUtil.java # common/src/vanillin/java/dev/engine_room/vanillin/text/TextVisual.java # common/src/vanillin/java/dev/engine_room/vanillin/visuals/ItemDisplayVisual.java # common/src/vanillin/java/dev/engine_room/vanillin/visuals/SignVisual.java
Support for new and old rendering styles
Update expected exception wording of testMalformedInclude
* imitate fabric-loom/b13a00e * Fog * Fog II * Bind main render target before submits * What the Helly * Revert "imitate fabric-loom/b13a00e" * Small cleanup * Merge branch '1.21.11/dev' into fork/Evoloxi/1.21.11/dev
# Conflicts: # buildSrc/src/main/kotlin/dev/engine_room/gradle/jarset/JarTaskSet.kt # common/src/vanillin/java/dev/engine_room/vanillin/visuals/ItemVisual.java
IThundxr
marked this pull request as ready for review
August 1, 2026 23:06
Jozufozu
reviewed
Aug 9, 2026
| if (!region.fence.isSignaled()) { | ||
| // We can't reclaim this region yet, and we know that all the regions after it are also not ready. | ||
| break; | ||
| try (GpuFence fence = region.fence) { |
Member
There was a problem hiding this comment.
Why GlFence above but GpuFence here? Mind explaining the differences with b3d's API? What's the advantage of switching to it vs keeping around the old Flywheel GlFence?
| ptr = writeFloat(ptr, level.getSkyDarken()); | ||
|
|
||
| ptr = writeInt(ptr, level.effects().constantAmbientLight() ? 1 : 0); | ||
| ptr = writeInt(ptr, level.dimensionType().cardinalLightType().ordinal()); |
|
|
||
| @Inject(method = "extractRenderState", at = @At("TAIL")) | ||
| private void flywheel$extendRenderState(CameraRenderState cameraState, float cameraEntityPartialTicks, CallbackInfo ci) { | ||
| ((CameraRenderStateExtension) cameraState).flywheel$getForwardVector().set(forwardVector()); |
Member
There was a problem hiding this comment.
Ah so we have to add the field to CameraRenderState for it to be copied over here...
Mind leaving a comment explaining how these 2 mixins play into eachother?
| import dev.engine_room.flywheel.backend.gl.GlStateTracker; | ||
| import dev.engine_room.flywheel.backend.gl.buffer.GlBufferType; | ||
|
|
||
| @Mixin(value = GlStateManager.class, remap = false) |
| @Mixin(GpuDevice.class) | ||
| public interface GpuDeviceAccessor { | ||
| @Accessor("backend") | ||
| GpuDeviceBackend flywheel$getBackend(); |
Member
There was a problem hiding this comment.
Oh no we have a name collision with backend now
| private void flywheel$disableTransparencyShaderDepth(CallbackInfo ci) { | ||
| GlStateManager._depthMask(false); | ||
| } | ||
| // TODO 1.21.11: Is this still needed? |
Member
There was a problem hiding this comment.
I don't think it is but we should confirm before merge
| thread.join(); | ||
| } catch (InterruptedException e) { | ||
| // | ||
| } catch (InterruptedException _) { |
| public static void addDebugInfo(Minecraft minecraft, List<String> systemInfo) { | ||
| if (minecraft.showOnlyReducedInfo()) { | ||
| return; | ||
| public static class FlwDebugEntry implements DebugScreenEntry { |
| public Deque<PoseStack.Pose> getPoseStack(PoseStack stack) { | ||
| return ((PoseStackAccessor) stack).flywheel$getPoseStack(); | ||
| public <T extends Entity> boolean affectedByCulling(T entity) { | ||
| EntityRenderer<? super T, ?> renderer = Minecraft.getInstance() |
Member
There was a problem hiding this comment.
Why do we need so many fewer properties now?
Member
Author
There was a problem hiding this comment.
Most were moved to libs.versions.toml which is the more gradle-correct way to manage dependencies
This file contains hidden or 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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
7 participants
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.