Port to 1.21.1

.github/workflows/build.yml

@@ -7,7 +7,7 @@ jobs:
     strategy:
       matrix:
         java: [
-          17     # Current Java LTS & minimum supported by Minecraft
+          21     # Current Java LTS & minimum supported by Minecraft
         ]
         os: [ ubuntu-latest ]
     runs-on: ${{ matrix.os }}

buildSrc/build.gradle.kts

@@ -8,8 +8,8 @@ plugins {
 repositories {
     gradlePluginPortal()
     mavenCentral()
-    maven("https://maven.minecraftforge.net/") {
-        name = "MinecraftForge"
+    maven("https://maven.neoforged.net/releases/") {
+        name = "NeoForged"
     }
     maven("https://maven.architectury.dev/") {
         name = "Architectury"

buildSrc/src/main/kotlin/dev/engine_room/gradle/subproject/SubprojectPlugin.kt

@@ -166,7 +166,7 @@ class SubprojectPlugin: Plugin<Project> {
     }
 }
 
-val processResourcesExpandFiles = listOf("pack.mcmeta", "fabric.mod.json", "META-INF/mods.toml")
+val processResourcesExpandFiles = listOf("pack.mcmeta", "fabric.mod.json", "META-INF/neoforge.mods.toml")
 
 val processResourcesExpandProperties = listOf(
     "mod_id",
@@ -180,6 +180,6 @@ val processResourcesExpandProperties = listOf(
     "minecraft_semver_version_range",
     "minecraft_maven_version_range",
     "fabric_api_version_range",
-    "forge_version_range",
+    "neoforge_version_range",
 )
 

common/build.gradle.kts

@@ -77,6 +77,8 @@ jarSets {
 dependencies {
     modCompileOnly("net.fabricmc:fabric-loader:${property("fabric_loader_version")}")
 
+    modCompileOnly("maven.modrinth:sodium:${property("sodium_version")}-fabric")
+
     testImplementation("org.junit.jupiter:junit-jupiter:5.8.1")
 }
 

common/src/api/java/dev/engine_room/flywheel/api/Flywheel.java

@@ -9,6 +9,6 @@ private Flywheel() {
 	}
 
 	public static ResourceLocation rl(String path) {
-		return new ResourceLocation(ID, path);
+		return ResourceLocation.fromNamespaceAndPath(ID, path);
 	}
 }

common/src/api/java/dev/engine_room/flywheel/api/RenderContext.java

@@ -16,7 +16,7 @@ public interface RenderContext {
 
 	RenderBuffers buffers();
 
-	PoseStack stack();
+	Matrix4fc modelView();
 
 	Matrix4fc projection();
 

common/src/backend/java/dev/engine_room/flywheel/backend/engine/uniform/FrameUniforms.java

@@ -73,7 +73,7 @@ public static void update(RenderContext context) {
 		var camY = (float) (cameraPos.y - renderOrigin.getY());
 		var camZ = (float) (cameraPos.z - renderOrigin.getZ());
 
-		VIEW.set(context.stack().last().pose());
+		VIEW.set(context.modelView());
 		VIEW.translate(-camX, -camY, -camZ);
 		PROJECTION.set(context.projection());
 		VIEW_PROJECTION.set(context.viewProjection());

common/src/backend/java/dev/engine_room/flywheel/backend/glsl/ShaderSources.java

@@ -41,7 +41,7 @@ public ShaderSources(ResourceManager manager) {
 	}
 
 	private static ResourceLocation locationWithoutFlywheelPrefix(ResourceLocation loc) {
-		return new ResourceLocation(loc.getNamespace(), loc.getPath()
+		return ResourceLocation.fromNamespaceAndPath(loc.getNamespace(), loc.getPath()
 				.substring(SHADER_DIR.length()));
 	}
 

common/src/backend/resources/flywheel.backend.mixins.json

@@ -2,7 +2,7 @@
   "required": true,
   "minVersion": "0.8",
   "package": "dev.engine_room.flywheel.backend.mixin",
-  "compatibilityLevel": "JAVA_17",
+  "compatibilityLevel": "JAVA_21",
   "refmap": "backend-flywheel.refmap.json",
   "client": [
     "AbstractClientPlayerAccessor",

common/src/lib/java/dev/engine_room/flywheel/lib/internal/FlwLibLink.java

@@ -21,7 +21,7 @@ public interface FlwLibLink {
 
 	Map<String, ModelPart> getModelPartChildren(ModelPart part);
 
-	void compileModelPart(ModelPart part, PoseStack.Pose pose, VertexConsumer consumer, int light, int overlay, float red, float green, float blue, float alpha);
+	void compileModelPart(ModelPart part, PoseStack.Pose pose, VertexConsumer consumer, int light, int overlay, int color);
 
 	Deque<PoseStack.Pose> getPoseStack(PoseStack stack);
 

common/src/lib/java/dev/engine_room/flywheel/lib/model/ModelUtil.java

@@ -60,7 +60,7 @@ public static Material getItemMaterial(RenderType renderType) {
 		if (renderType == Sheets.translucentCullBlockSheet() || renderType == Sheets.translucentItemSheet()) {
 			return Materials.CUTOUT_BLOCK;
 		}
-		if (renderType == RenderType.glint() || renderType == RenderType.glintDirect()) {
+		if (renderType == RenderType.glint() || renderType == RenderType.glintTranslucent()) {
 			return Materials.GLINT;
 		}
 		if (renderType == RenderType.entityGlint() || renderType == RenderType.entityGlintDirect()) {

common/src/lib/java/dev/engine_room/flywheel/lib/model/baked/MeshHelper.java

@@ -5,7 +5,7 @@
 import org.jetbrains.annotations.Nullable;
 import org.lwjgl.system.MemoryUtil;
 
-import com.mojang.blaze3d.vertex.BufferBuilder;
+import com.mojang.blaze3d.vertex.MeshData;
 
 import dev.engine_room.flywheel.lib.memory.MemoryBlock;
 import dev.engine_room.flywheel.lib.model.SimpleQuadMesh;
@@ -16,15 +16,15 @@ final class MeshHelper {
 	private MeshHelper() {
 	}
 
-	public static SimpleQuadMesh blockVerticesToMesh(BufferBuilder.RenderedBuffer buffer, @Nullable String meshDescriptor) {
-		BufferBuilder.DrawState drawState = buffer.drawState();
+	public static SimpleQuadMesh blockVerticesToMesh(MeshData data, @Nullable String meshDescriptor) {
+		MeshData.DrawState drawState = data.drawState();
 		int vertexCount = drawState.vertexCount();
 		long srcStride = drawState.format().getVertexSize();
 
 		VertexView vertexView = new NoOverlayVertexView();
 		long dstStride = vertexView.stride();
 
-		ByteBuffer src = buffer.vertexBuffer();
+		ByteBuffer src = data.vertexBuffer();
 		MemoryBlock dst = MemoryBlock.mallocTracked((long) vertexCount * dstStride);
 		long srcPtr = MemoryUtil.memAddress(src);
 		long dstPtr = dst.ptr();

common/src/lib/java/dev/engine_room/flywheel/lib/model/baked/TransformingVertexConsumer.java

@@ -26,67 +26,46 @@ public void clear() {
 	}
 
 	@Override
-	public VertexConsumer vertex(double x, double y, double z) {
+	public VertexConsumer addVertex(float x, float y, float z) {
 		Matrix4f matrix = poseStack.last().pose();
-		float fx = (float) x;
-		float fy = (float) y;
-		float fz = (float) z;
-		delegate.vertex(
-				MatrixMath.transformPositionX(matrix, fx, fy, fz),
-				MatrixMath.transformPositionY(matrix, fx, fy, fz),
-				MatrixMath.transformPositionZ(matrix, fx, fy, fz));
+		delegate.addVertex(
+				MatrixMath.transformPositionX(matrix, x, y, z),
+				MatrixMath.transformPositionY(matrix, x, y, z),
+				MatrixMath.transformPositionZ(matrix, x, y, z));
 		return this;
 	}
 
 	@Override
-	public VertexConsumer color(int red, int green, int blue, int alpha) {
-		delegate.color(red, green, blue, alpha);
+	public VertexConsumer setColor(int red, int green, int blue, int alpha) {
+		delegate.setColor(red, green, blue, alpha);
 		return this;
 	}
 
 	@Override
-	public VertexConsumer uv(float u, float v) {
-		delegate.uv(u, v);
+	public VertexConsumer setUv(float u, float v) {
+		delegate.setUv(u, v);
 		return this;
 	}
 
 	@Override
-	public VertexConsumer overlayCoords(int u, int v) {
-		delegate.overlayCoords(u, v);
+	public VertexConsumer setUv1(int u, int v) {
+		delegate.setUv1(u, v);
 		return this;
 	}
 
 	@Override
-	public VertexConsumer uv2(int u, int v) {
-		delegate.uv2(u, v);
+	public VertexConsumer setUv2(int u, int v) {
+		delegate.setUv2(u, v);
 		return this;
 	}
 
 	@Override
-	public VertexConsumer normal(float x, float y, float z) {
+	public VertexConsumer setNormal(float x, float y, float z) {
 		Matrix3f matrix = poseStack.last().normal();
-		float fx = (float) x;
-		float fy = (float) y;
-		float fz = (float) z;
-		delegate.normal(
-				MatrixMath.transformNormalX(matrix, fx, fy, fz),
-				MatrixMath.transformNormalY(matrix, fx, fy, fz),
-				MatrixMath.transformNormalZ(matrix, fx, fy, fz));
+		delegate.setNormal(
+				MatrixMath.transformNormalX(matrix, x, y, z),
+				MatrixMath.transformNormalY(matrix, x, y, z),
+				MatrixMath.transformNormalZ(matrix, x, y, z));
 		return this;
 	}
-
-	@Override
-	public void endVertex() {
-		delegate.endVertex();
-	}
-
-	@Override
-	public void defaultColor(int red, int green, int blue, int alpha) {
-		delegate.defaultColor(red, green, blue, alpha);
-	}
-
-	@Override
-	public void unsetDefaultColor() {
-		delegate.unsetDefaultColor();
-	}
 }

common/src/lib/java/dev/engine_room/flywheel/lib/model/part/MeshTree.java

@@ -74,7 +74,7 @@ private static Mesh compile(ModelPart modelPart, ThreadLocalObjects objects) {
 		}
 
 		VertexWriter vertexWriter = objects.vertexWriter;
-		FlwLibLink.INSTANCE.compileModelPart(modelPart, IDENTITY_POSE, vertexWriter, LightTexture.FULL_BRIGHT, OverlayTexture.NO_OVERLAY, 1.0F, 1.0F, 1.0F, 1.0F);
+		FlwLibLink.INSTANCE.compileModelPart(modelPart, IDENTITY_POSE, vertexWriter, LightTexture.FULL_BRIGHT, OverlayTexture.NO_OVERLAY, 0xFFFFFFFF);
 		MemoryBlock data = vertexWriter.copyDataAndReset();
 
 		VertexView vertexView = new PosTexNormalVertexView();

common/src/lib/java/dev/engine_room/flywheel/lib/model/part/VertexWriter.java

@@ -23,62 +23,62 @@ public VertexWriter() {
 	}
 
 	@Override
-	public VertexConsumer vertex(double x, double y, double z) {
+	public VertexConsumer addVertex(float x, float y, float z) {
 		if (!filledPosition) {
 			long ptr = vertexPtr();
-			MemoryUtil.memPutFloat(ptr, (float) x);
-			MemoryUtil.memPutFloat(ptr + 4, (float) y);
-			MemoryUtil.memPutFloat(ptr + 8, (float) z);
+			MemoryUtil.memPutFloat(ptr, x);
+			MemoryUtil.memPutFloat(ptr + 4, y);
+			MemoryUtil.memPutFloat(ptr + 8, z);
 			filledPosition = true;
 		}
-		return this;
+		return endVertexIfNeeded();
 	}
 
 	@Override
-	public VertexConsumer color(int red, int green, int blue, int alpha) {
+	public VertexConsumer setColor(int red, int green, int blue, int alpha) {
 		// ignore color
-		return this;
+		return endVertexIfNeeded();
 	}
 
 	@Override
-	public VertexConsumer uv(float u, float v) {
+	public VertexConsumer setUv(float u, float v) {
 		if (!filledTexture) {
 			long ptr = vertexPtr();
 			MemoryUtil.memPutFloat(ptr + 12, u);
 			MemoryUtil.memPutFloat(ptr + 16, v);
 			filledTexture = true;
 		}
-		return this;
+		return endVertexIfNeeded();
 	}
 
 	@Override
-	public VertexConsumer overlayCoords(int u, int v) {
+	public VertexConsumer setUv1(int u, int v) {
 		// ignore overlay
-		return this;
+		return endVertexIfNeeded();
 	}
 
 	@Override
-	public VertexConsumer uv2(int u, int v) {
+	public VertexConsumer setUv2(int u, int v) {
 		// ignore light
-		return this;
+		return endVertexIfNeeded();
 	}
 
 	@Override
-	public VertexConsumer normal(float x, float y, float z) {
+	public VertexConsumer setNormal(float x, float y, float z) {
 		if (!filledNormal) {
 			long ptr = vertexPtr();
 			MemoryUtil.memPutByte(ptr + 20, DataPacker.packNormI8(x));
 			MemoryUtil.memPutByte(ptr + 21, DataPacker.packNormI8(y));
 			MemoryUtil.memPutByte(ptr + 22, DataPacker.packNormI8(z));
 			filledNormal = true;
 		}
-		return this;
+		return endVertexIfNeeded();
 	}
 
-	@Override
-	public void endVertex() {
+	public VertexConsumer endVertexIfNeeded() {
 		if (!filledPosition || !filledTexture || !filledNormal) {
-			throw new IllegalStateException("Not filled all elements of the vertex");
+			// We do not throw here as that matched what vanilla does
+			return this;
 		}
 
 		filledPosition = false;
@@ -91,14 +91,8 @@ public void endVertex() {
 		if (byteSize > capacity) {
 			data = data.realloc(capacity * 2);
 		}
-	}
-
-	@Override
-	public void defaultColor(int red, int green, int blue, int alpha) {
-	}
 
-	@Override
-	public void unsetDefaultColor() {
+		return this;
 	}
 
 	private long vertexPtr() {

common/src/lib/java/dev/engine_room/flywheel/lib/util/ResourceUtil.java

@@ -16,7 +16,7 @@ private ResourceUtil() {
 	}
 
 	/**
-	 * Same as {@link ResourceLocation#ResourceLocation(String)}, but defaults to Flywheel namespace.
+	 * Same as {@link ResourceLocation#parse(String)}, but defaults to Flywheel namespace.
 	 */
 	public static ResourceLocation parseFlywheelDefault(String location) {
 		String namespace = Flywheel.ID;
@@ -30,7 +30,7 @@ public static ResourceLocation parseFlywheelDefault(String location) {
 			}
 		}
 
-		return new ResourceLocation(namespace, path);
+		return ResourceLocation.fromNamespaceAndPath(namespace, path);
 	}
 
 	/**

common/src/lib/java/dev/engine_room/flywheel/lib/vertex/VertexTransformations.java

@@ -8,8 +8,8 @@ private VertexTransformations() {
 	}
 
 	public static void retexture(MutableVertexList vertexList, int index, TextureAtlasSprite sprite) {
-		vertexList.u(index, sprite.getU(vertexList.u(index) * 16));
-		vertexList.v(index, sprite.getV(vertexList.v(index) * 16));
+		vertexList.u(index, sprite.getU(vertexList.u(index)));
+		vertexList.v(index, sprite.getV(vertexList.v(index)));
 	}
 
 	public static void retexture(MutableVertexList vertexList, TextureAtlasSprite sprite) {

common/src/lib/java/dev/engine_room/flywheel/lib/visual/component/ShadowComponent.java

@@ -42,7 +42,7 @@
  * The shadow will be cast on blocks at most {@code min(radius, 2 * strength)} blocks below the entity.</p>
  */
 public final class ShadowComponent implements EntityComponent {
-	private static final ResourceLocation SHADOW_TEXTURE = new ResourceLocation("textures/misc/shadow.png");
+	private static final ResourceLocation SHADOW_TEXTURE = ResourceLocation.withDefaultNamespace("textures/misc/shadow.png");
 	private static final Material SHADOW_MATERIAL = SimpleMaterial.builder()
 			.texture(SHADOW_TEXTURE)
 			.mipmap(false)

common/src/main/java/dev/engine_room/flywheel/impl/FlwLibLinkImpl.java

@@ -34,8 +34,8 @@ public Map<String, ModelPart> getModelPartChildren(ModelPart part) {
 	}
 
 	@Override
-	public void compileModelPart(ModelPart part, PoseStack.Pose pose, VertexConsumer consumer, int light, int overlay, float red, float green, float blue, float alpha) {
-		((ModelPartAccessor) (Object) part).flywheel$compile(pose, consumer, light, overlay, red, green, blue, alpha);
+	public void compileModelPart(ModelPart part, PoseStack.Pose pose, VertexConsumer consumer, int light, int overlay, int color) {
+		((ModelPartAccessor) (Object) part).flywheel$compile(pose, consumer, light, overlay, color);
 	}
 
 	@Override

common/src/main/java/dev/engine_room/flywheel/impl/compat/CompatMods.java

@@ -0,0 +1,14 @@
+package dev.engine_room.flywheel.impl.compat;
+
+import dev.engine_room.flywheel.impl.FlwImplXplat;
+
+public enum CompatMods {
+	IRIS("iris"),
+	SODIUM("sodium");
+
+	public final boolean isLoaded;
+
+	CompatMods(String modId) {
+		isLoaded = FlwImplXplat.INSTANCE.isModLoaded(modId);
+	}
+}