Initial port to 26.1.2 by IThundxr · Pull Request #333 · Engine-Room/Flywheel

IThundxr · 2026-06-28T20:51:52Z

No description provided.

# 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

Jozufozu · 2026-08-09T00:05:27Z

-			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) {


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?

No real difference between the two, was mostly done so that moving to b3d later was easier, but it's not as relevent anymore

Jozufozu · 2026-08-09T00:06:42Z

+		ptr = writeFloat(ptr, level.getSkyDarken());

-		ptr = writeInt(ptr, level.effects().constantAmbientLight() ? 1 : 0);
+		ptr = writeInt(ptr, level.dimensionType().cardinalLightType().ordinal());


Jozufozu · 2026-08-09T00:11:14Z

+
+	@Inject(method = "extractRenderState", at = @At("TAIL"))
+	private void flywheel$extendRenderState(CameraRenderState cameraState, float cameraEntityPartialTicks, CallbackInfo ci) {
+		((CameraRenderStateExtension) cameraState).flywheel$getForwardVector().set(forwardVector());


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?

Jozufozu · 2026-08-09T00:12:16Z

 import dev.engine_room.flywheel.backend.gl.GlStateTracker;
 import dev.engine_room.flywheel.backend.gl.buffer.GlBufferType;

-@Mixin(value = GlStateManager.class, remap = false)


Jozufozu · 2026-08-09T00:12:50Z

+@Mixin(GpuDevice.class)
+public interface GpuDeviceAccessor {
+	@Accessor("backend")
+	GpuDeviceBackend flywheel$getBackend();


Oh no we have a name collision with backend now

Jozufozu · 2026-08-09T00:28:11Z

-	private void flywheel$disableTransparencyShaderDepth(CallbackInfo ci) {
-		GlStateManager._depthMask(false);
-	}
+	// TODO 1.21.11: Is this still needed?


I don't think it is but we should confirm before merge

Jozufozu · 2026-08-09T00:29:47Z

 				thread.join();
-			} catch (InterruptedException e) {
-				//
+			} catch (InterruptedException _) {


Jozufozu · 2026-08-09T00:31:04Z

-	public static void addDebugInfo(Minecraft minecraft, List<String> systemInfo) {
-		if (minecraft.showOnlyReducedInfo()) {
-			return;
+	public static class FlwDebugEntry implements DebugScreenEntry {


oooh very fancy

Jozufozu · 2026-08-09T00:31:33Z

-	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()


Jozufozu · 2026-08-09T00:35:34Z

Why do we need so many fewer properties now?

Most were moved to libs.versions.toml which is the more gradle-correct way to manage dependencies

Rebased onto Engine-Room#333 (IThundxr:26.1.2/dev), the real 1.21.1 -> 26.1.2 port, which also migrates NeoForge onto ModDevGradle and Fabric onto Fabric Loom, sidestepping the missing official Mojang mappings. Version bumps: - minecraft 26.1.2 -> 26.2, neoforge 26.1.2.78 -> 26.2.0.67 - fabric-api 0.154.2+26.1.2 -> 0.158.0+26.2 - sodium 0.9.1+mc26.1.2 -> 0.9.2-alpha.4+mc26.2 - iris 1.11.2+26.1 -> 1.11.2+26.2 (both loaders) - org.gradle.configureondemand disabled: with it on, cross-project source set access fails as 'Extension of type SourceSetContainer does not exist' 26.2 API changes in common/lib: - VertexFormatElement is now a record with no static constants, and VertexFormat.builder takes a step rate, so FlywheelVertexFormats builds through addAttribute with GpuFormat values. RGBA8_SNORM for the normal already includes the byte that used to be explicit padding. - VertexFormat.Mode -> com.mojang.blaze3d.PrimitiveTopology - LevelRenderer.getLightCoords -> net.minecraft.util.LightCoordsUtil - Sheets.cutoutBlockSheet -> Sheets.cutoutBlockItemSheet flywheel-common:compileLibJava passes. The backend source set still has 14 errors around render targets and framebuffers. Co-Authored-By: Claude Opus 5 (1M context) <noreply@anthropic.com> EOF

IThundxr and others added 30 commits December 22, 2025 19:27

Update dependencies for 1.21.11

2fb454e

ResourceLocation -> Identifier

7a48a38

Update GeneratePackageInfosTask and switch to @NullMarked from jspecify

736b9de

Switch from jetbrains annotations to jspecify

260d81b

FastColor.ARGB32 -> ARGB

230498a

1.21.1 Porting I

f9c9832

1.21.1 Porting II

ab818bf

1.21.1 Porting III

dafc480

1.21.1 Porting IV

1fca235

1.21.1 Porting V

dd16a1e

1.21.1 Porting VI

83fc920

1.21.1 Porting VII

74a9b78

1.21.1 Porting VIII

d41f008

1.21.1 Porting IX

cb51e7f

Partial(lyPorted)Model

843af33

Fix accessor and sodium dependency

4e9ac33

Remove RecyclingPoseStack

3f18374

Update flywheel.impl.mixins.json

d133d44

Undo removal of flywheel.impl.neoforge.mixins.json

4c5be61

Merge remote-tracking branch 'origin/1.21.11/dev' into 1.21.11/dev

89a0da5

Modernise MinecartVisual

faf3623

Support for new and old rendering styles

Update expected exception wording of testMalformedInclude

606e302

Merge pull request #2 from AyOhEe/1.21.11/test-malformed-include-fix

85ce5af

Update expected exception wording of testMalformedInclude

Merge pull request #1 from AyOhEe/1.21.11/minecart-visual

0edccd1

Disable vanillin, more porting

830ba53

Fog fixes

5618a0b

Merge pull request #3

08f24b6

* 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

Mixin fixes

2ea52a9

Merge remote-tracking branch 'origin/1.21.11/dev' into 1.21.11/dev

acb64b0

IThundxr and others added 12 commits May 5, 2026 17:46

Fix some more TODOs

6eff4e3

Update to 26.1.2

bbbe05f

Fix crumbling overlay being blurry

837cbbc

Update to 26.1.2

0ae1a8a

Enable --renderDebugLabels

82f43b4

Merge remote-tracking branch 'origin/26.1.2/dev' into 26.1.2/dev

7ee795c

Shutdown task executors on client stop

74bc696

Make MeshEmitter, MeshEmitterManager, BlockStateModelBufferer public (#5

7c40245

)

Enable enhanced hotswap

d94131e

Fix FlwDebugEntry

8ac397e

Fix jarjar artifactId (Engine-Room#322)

5892742

Merge remote-tracking branch 'origin/1.21.1/dev' into 26.1.2/dev

4484a54

# Conflicts: # buildSrc/src/main/kotlin/dev/engine_room/gradle/jarset/JarTaskSet.kt # common/src/vanillin/java/dev/engine_room/vanillin/visuals/ItemVisual.java

IThundxr force-pushed the 26.1.2/dev branch from 58aa3e9 to 4484a54 Compare July 12, 2026 01:56

IThundxr added 8 commits July 12, 2026 16:40

Refactor buildscripts

c855f74

Fix accesswidener

6eafd80

Use typesafe project accessor for common AW path

b39a633

Fix version fetching for headless test

11b9d0e

Remove testmod

2eff2d4

remove deprecation annotations

8ed808c

fix cardinal lighting

f66238a

Misc fixes

1676540

IThundxr force-pushed the 26.1.2/dev branch from 6db5607 to e7f9f09 Compare July 13, 2026 02:32

add AT to NMT

c5d08d1

IThundxr force-pushed the 26.1.2/dev branch from e7f9f09 to c5d08d1 Compare July 13, 2026 02:32

Add generatedPackageInfos to idea excludedDirs

5ee0a74

IThundxr force-pushed the 26.1.2/dev branch from f39c76e to 5ee0a74 Compare July 15, 2026 20:07

Some more gradle properties to improve project times

1dce276

IThundxr marked this pull request as ready for review August 1, 2026 23:06

Jozufozu reviewed Aug 9, 2026

View reviewed changes

Navigation Menu

Uh oh!

Uh oh!

Initial port to 26.1.2 - #333

Initial port to 26.1.2#333
IThundxr wants to merge 78 commits into
Engine-Room:26.1.2/devfrom
IThundxr:26.1.2/dev

IThundxr commented Jun 28, 2026

Uh oh!

Jozufozu Aug 9, 2026

Uh oh!

IThundxr Aug 10, 2026

Uh oh!

Jozufozu Aug 9, 2026

Uh oh!

Jozufozu Aug 9, 2026

Uh oh!

Jozufozu Aug 9, 2026

Uh oh!

Jozufozu Aug 9, 2026

Uh oh!

Jozufozu Aug 9, 2026

Uh oh!

Jozufozu Aug 9, 2026

Uh oh!

Jozufozu Aug 9, 2026

Uh oh!

Jozufozu Aug 9, 2026

Uh oh!

Jozufozu Aug 9, 2026

Uh oh!

IThundxr Aug 9, 2026

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

7 participants

Uh oh!

Uh oh!

Conversation

IThundxr commented Jun 28, 2026

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

7 participants