Port to 1.21.1

.github/workflows/build.yml

@@ -3,7 +3,7 @@ name: Build
 on: [ workflow_dispatch, pull_request, push ]
 
 env:
-  JAVA_VERSION: 17
+  JAVA_VERSION: 21
 
 jobs:
   build:
@@ -43,13 +43,13 @@ jobs:
           path: |
             common/build/libs/
             fabric/build/libs/
-            forge/build/libs/
+            neoforge/build/libs/
 
   test:
     strategy:
       fail-fast: false
       matrix:
-        loader: [ forge, fabric ]
+        loader: [ neoforge, fabric ]
     needs: build
     runs-on: ubuntu-latest
     steps:

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

@@ -9,7 +9,6 @@ plugins {
 val api = sourceSets.create("api")
 val lib = sourceSets.create("lib")
 val backend = sourceSets.create("backend")
-val stubs = sourceSets.create("stubs")
 val main = sourceSets.getByName("main")
 
 transitiveSourceSets {
@@ -26,11 +25,8 @@ transitiveSourceSets {
         rootCompile()
         compile(api, lib)
     }
-    sourceSet(stubs) {
-        rootCompile()
-    }
     sourceSet(main) {
-        compile(api, lib, backend, stubs)
+        compile(api, lib, backend)
     }
     sourceSet(sourceSets.getByName("test")) {
         implementation(api, lib, backend)
@@ -46,7 +42,6 @@ jarSets {
     outgoing("commonApiOnly", api)
     outgoing("commonLib", lib)
     outgoing("commonBackend", backend)
-    outgoing("commonStubs", stubs)
     outgoing("commonImpl", main)
 
     // For publishing.
@@ -77,6 +72,9 @@ jarSets {
 dependencies {
     modCompileOnly("net.fabricmc:fabric-loader:${property("fabric_loader_version")}")
 
+    modCompileOnly("maven.modrinth:sodium:${property("sodium_version")}-fabric")
+    modCompileOnly("maven.modrinth:iris:${property("iris_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

@@ -2,8 +2,6 @@
 
 import org.joml.Matrix4fc;
 
-import com.mojang.blaze3d.vertex.PoseStack;
-
 import net.minecraft.client.Camera;
 import net.minecraft.client.multiplayer.ClientLevel;
 import net.minecraft.client.renderer.LevelRenderer;
@@ -16,7 +14,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/internal/FlwLibXplat.java

@@ -3,25 +3,23 @@
 import org.jetbrains.annotations.UnknownNullability;
 
 import dev.engine_room.flywheel.api.internal.DependencyInjection;
+import dev.engine_room.flywheel.lib.model.SimpleModel;
 import dev.engine_room.flywheel.lib.model.baked.BakedModelBuilder;
 import dev.engine_room.flywheel.lib.model.baked.BlockModelBuilder;
 import dev.engine_room.flywheel.lib.model.baked.MultiBlockModelBuilder;
 import net.minecraft.client.resources.model.BakedModel;
 import net.minecraft.client.resources.model.ModelManager;
-import net.minecraft.core.BlockPos;
 import net.minecraft.resources.ResourceLocation;
-import net.minecraft.world.level.BlockAndTintGetter;
-import net.minecraft.world.level.block.state.BlockState;
 
 public interface FlwLibXplat {
 	FlwLibXplat INSTANCE = DependencyInjection.load(FlwLibXplat.class, "dev.engine_room.flywheel.impl.FlwLibXplatImpl");
 
 	@UnknownNullability
 	BakedModel getBakedModel(ModelManager modelManager, ResourceLocation location);
 
-	BakedModelBuilder createBakedModelBuilder(BakedModel bakedModel);
+	SimpleModel buildBakedModelBuilder(BakedModelBuilder builder);
 
-	BlockModelBuilder createBlockModelBuilder(BlockState state);
+	SimpleModel buildBlockModelBuilder(BlockModelBuilder builder);
 
-	MultiBlockModelBuilder createMultiBlockModelBuilder(BlockAndTintGetter level, Iterable<BlockPos> positions);
+	SimpleModel buildMultiBlockModelBuilder(MultiBlockModelBuilder builder);
 }

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

@@ -53,7 +53,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/Models.java

@@ -20,9 +20,9 @@
  * method with the same parameters will return the same object.
  */
 public final class Models {
-	private static final RendererReloadCache<BlockState, Model> BLOCK_STATE = new RendererReloadCache<>(it -> BlockModelBuilder.create(it)
+	private static final RendererReloadCache<BlockState, Model> BLOCK_STATE = new RendererReloadCache<>(it -> new BlockModelBuilder(it)
 			.build());
-	private static final RendererReloadCache<PartialModel, Model> PARTIAL = new RendererReloadCache<>(it -> BakedModelBuilder.create(it.get())
+	private static final RendererReloadCache<PartialModel, Model> PARTIAL = new RendererReloadCache<>(it -> new BakedModelBuilder(it.get())
 			.build());
 	private static final RendererReloadCache<TransformedPartial<?>, Model> TRANSFORMED_PARTIAL = new RendererReloadCache<>(TransformedPartial::create);
 
@@ -88,7 +88,7 @@ private record TransformedPartial<T>(PartialModel partial, T key, BiConsumer<T,
 		private Model create() {
 			var stack = new PoseStack();
 			transformer.accept(key, stack);
-			return BakedModelBuilder.create(partial.get())
+			return new BakedModelBuilder(partial.get())
 					.poseStack(stack)
 					.build();
 		}

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

@@ -2,21 +2,20 @@
 
 import java.util.function.BiFunction;
 
-import org.jetbrains.annotations.ApiStatus;
 import org.jetbrains.annotations.Nullable;
 
 import com.mojang.blaze3d.vertex.PoseStack;
 
 import dev.engine_room.flywheel.api.material.Material;
 import dev.engine_room.flywheel.lib.internal.FlwLibXplat;
+import dev.engine_room.flywheel.lib.model.ModelUtil;
 import dev.engine_room.flywheel.lib.model.SimpleModel;
 import net.minecraft.client.renderer.RenderType;
 import net.minecraft.client.resources.model.BakedModel;
 import net.minecraft.world.level.BlockAndTintGetter;
 import net.minecraft.world.level.block.state.BlockState;
 
-@ApiStatus.NonExtendable
-public abstract class BakedModelBuilder {
+public final class BakedModelBuilder {
 	final BakedModel bakedModel;
 	@Nullable
 	BlockAndTintGetter level;
@@ -27,14 +26,10 @@ public abstract class BakedModelBuilder {
 	@Nullable
 	BiFunction<RenderType, Boolean, Material> materialFunc;
 
-	BakedModelBuilder(BakedModel bakedModel) {
+	public BakedModelBuilder(BakedModel bakedModel) {
 		this.bakedModel = bakedModel;
 	}
 
-	public static BakedModelBuilder create(BakedModel bakedModel) {
-		return FlwLibXplat.INSTANCE.createBakedModelBuilder(bakedModel);
-	}
-
 	public BakedModelBuilder level(BlockAndTintGetter level) {
 		this.level = level;
 		return this;
@@ -55,5 +50,11 @@ public BakedModelBuilder materialFunc(BiFunction<RenderType, Boolean, Material>
 		return this;
 	}
 
-	public abstract SimpleModel build();
+	public SimpleModel build() {
+		if (materialFunc == null) {
+			materialFunc = ModelUtil::getMaterial;
+		}
+
+		return FlwLibXplat.INSTANCE.buildBakedModelBuilder(this);
+	}
 }

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

@@ -2,20 +2,19 @@
 
 import java.util.function.BiFunction;
 
-import org.jetbrains.annotations.ApiStatus;
 import org.jetbrains.annotations.Nullable;
 
 import com.mojang.blaze3d.vertex.PoseStack;
 
 import dev.engine_room.flywheel.api.material.Material;
 import dev.engine_room.flywheel.lib.internal.FlwLibXplat;
+import dev.engine_room.flywheel.lib.model.ModelUtil;
 import dev.engine_room.flywheel.lib.model.SimpleModel;
 import net.minecraft.client.renderer.RenderType;
 import net.minecraft.world.level.BlockAndTintGetter;
 import net.minecraft.world.level.block.state.BlockState;
 
-@ApiStatus.NonExtendable
-public abstract class BlockModelBuilder {
+public final class BlockModelBuilder {
 	final BlockState state;
 	@Nullable
 	BlockAndTintGetter level;
@@ -24,14 +23,10 @@ public abstract class BlockModelBuilder {
 	@Nullable
 	BiFunction<RenderType, Boolean, Material> materialFunc;
 
-	BlockModelBuilder(BlockState state) {
+	public BlockModelBuilder(BlockState state) {
 		this.state = state;
 	}
 
-	public static BlockModelBuilder create(BlockState state) {
-		return FlwLibXplat.INSTANCE.createBlockModelBuilder(state);
-	}
-
 	public BlockModelBuilder level(BlockAndTintGetter level) {
 		this.level = level;
 		return this;
@@ -47,5 +42,11 @@ public BlockModelBuilder materialFunc(BiFunction<RenderType, Boolean, Material>
 		return this;
 	}
 
-	public abstract SimpleModel build();
+	public SimpleModel build() {
+		if (materialFunc == null) {
+			materialFunc = ModelUtil::getMaterial;
+		}
+
+		return FlwLibXplat.INSTANCE.buildBlockModelBuilder(this);
+	}
 }

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/MultiBlockModelBuilder.java

@@ -2,20 +2,19 @@
 
 import java.util.function.BiFunction;
 
-import org.jetbrains.annotations.ApiStatus;
 import org.jetbrains.annotations.Nullable;
 
 import com.mojang.blaze3d.vertex.PoseStack;
 
 import dev.engine_room.flywheel.api.material.Material;
 import dev.engine_room.flywheel.lib.internal.FlwLibXplat;
+import dev.engine_room.flywheel.lib.model.ModelUtil;
 import dev.engine_room.flywheel.lib.model.SimpleModel;
 import net.minecraft.client.renderer.RenderType;
 import net.minecraft.core.BlockPos;
 import net.minecraft.world.level.BlockAndTintGetter;
 
-@ApiStatus.NonExtendable
-public abstract class MultiBlockModelBuilder {
+public final class MultiBlockModelBuilder {
 	final BlockAndTintGetter level;
 	final Iterable<BlockPos> positions;
 	@Nullable
@@ -24,15 +23,11 @@ public abstract class MultiBlockModelBuilder {
 	@Nullable
 	BiFunction<RenderType, Boolean, Material> materialFunc;
 
-	MultiBlockModelBuilder(BlockAndTintGetter level, Iterable<BlockPos> positions) {
+	public MultiBlockModelBuilder(BlockAndTintGetter level, Iterable<BlockPos> positions) {
 		this.level = level;
 		this.positions = positions;
 	}
 
-	public static MultiBlockModelBuilder create(BlockAndTintGetter level, Iterable<BlockPos> positions) {
-		return FlwLibXplat.INSTANCE.createMultiBlockModelBuilder(level, positions);
-	}
-
 	public MultiBlockModelBuilder poseStack(PoseStack poseStack) {
 		this.poseStack = poseStack;
 		return this;
@@ -48,5 +43,11 @@ public MultiBlockModelBuilder materialFunc(BiFunction<RenderType, Boolean, Mater
 		return this;
 	}
 
-	public abstract SimpleModel build();
+	public SimpleModel build() {
+		if (materialFunc == null) {
+			materialFunc = ModelUtil::getMaterial;
+		}
+
+		return FlwLibXplat.INSTANCE.buildMultiBlockModelBuilder(this);
+	}
 }