Ported to 1.21.4

build.gradle

@@ -3,7 +3,7 @@ plugins {
     id 'eclipse'
     id 'idea'
     id 'maven-publish'
-    id 'net.neoforged.gradle.userdev' version '7.0.145'
+    id 'net.neoforged.gradle.userdev' version '7.0.181'
 }
 
 tasks.named('wrapper', Wrapper).configure {
@@ -79,14 +79,6 @@ runs {
     gameTestServer {
         systemProperty 'forge.enabledGameTestNamespaces', project.mod_id
     }
-
-    data {
-        // example of overriding the workingDirectory set in configureEach above, uncomment if you want to use it
-        // workingDirectory project.file('run-data')
-
-        // Specify the modid for data generation, where to output the resulting resource, and where to look for existing resources.
-        programArguments.addAll '--mod', project.mod_id, '--all', '--output', file('src/generated/resources/').getAbsolutePath(), '--existing', file('src/main/resources/').getAbsolutePath()
-    }
 }
 
 // Include resources generated by data generators.
@@ -130,8 +122,8 @@ dependencies {
     // For more info:
     // http://www.gradle.org/docs/current/userguide/artifact_dependencies_tutorial.html
     // http://www.gradle.org/docs/current/userguide/dependency_management.html54
-    implementation "maven.modrinth:sodium:mc1.21-0.6.0-beta.1-neoforge"
-    implementation "maven.modrinth:iris:1.8.0-beta.2+1.21-neoforge"
+    implementation "maven.modrinth:sodium:mc1.21.4-0.6.7-neoforge"
+    implementation "maven.modrinth:iris:1.8.5+1.21.4-neoforge"
 }
 
 // This block of code expands all declared replace properties in the specified resource targets.

gradle.properties

@@ -5,20 +5,20 @@ org.gradle.debug=false
 
 #read more on this at https://github.com/neoforged/NeoGradle/blob/NG_7.0/README.md#apply-parchment-mappings
 # you can also find the latest versions at: https://parchmentmc.org/docs/getting-started
-neogradle.subsystems.parchment.minecraftVersion=1.21
-neogradle.subsystems.parchment.mappingsVersion=2024.11.10
+neogradle.subsystems.parchment.minecraftVersion=1.21.4
+neogradle.subsystems.parchment.mappingsVersion=2025.01.19
 # Environment Properties
 # You can find the latest versions here: https://projects.neoforged.net/neoforged/neoforge
 # The Minecraft version must agree with the Neo version to get a valid artifact
-minecraft_version=1.21
+minecraft_version=1.21.4
 # The Minecraft version range can use any release version of Minecraft as bounds.
 # Snapshots, pre-releases, and release candidates are not guaranteed to sort properly
 # as they do not follow standard versioning conventions.
-minecraft_version_range=[1.21,1.21.1)
+minecraft_version_range=[1.21,1.21.4]
 # The Neo version must agree with the Minecraft version to get a valid artifact
-neo_version=21.0.167
+neo_version=21.4.87-beta
 # The Neo version range can use any version of Neo as bounds
-neo_version_range=[21.0.0-beta,)
+neo_version_range=[21.4.0-beta,)
 # The loader version range can only use the major version of FML as bounds
 loader_version_range=[4,)
 

gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.9-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.12.1-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME

src/main/java/com/github/argon4w/acceleratedrendering/compat/iris/IrisBufferEnvironment.java

@@ -12,6 +12,7 @@
 import com.mojang.blaze3d.vertex.VertexFormatElement;
 import net.irisshaders.iris.shaderpack.materialmap.WorldRenderingSettings;
 import net.irisshaders.iris.vertices.ImmediateState;
+import net.irisshaders.iris.vertices.sodium.terrain.XHFPModelVertexType;
 import net.minecraft.client.renderer.RenderType;
 
 public class IrisBufferEnvironment implements IBufferEnvironment {
@@ -29,7 +30,7 @@ public IrisBufferEnvironment(
     }
 
     private boolean shouldUseIrisSubSet() {
-        return WorldRenderingSettings.INSTANCE.shouldUseExtendedVertexFormat()
+        return WorldRenderingSettings.INSTANCE.getVertexFormat() instanceof XHFPModelVertexType
                 && ImmediateState.isRenderingLevel;
     }
 

src/main/java/com/github/argon4w/acceleratedrendering/compat/iris/IrisRenderType.java

@@ -17,14 +17,14 @@ public IrisRenderType(
             VertexFormat vertexFormat
     ) {
         super(
-                renderType.name,
+                renderType.toString(),
                 vertexFormat,
                 renderType.mode,
                 renderType.bufferSize,
                 renderType.affectsCrumbling,
                 renderType.sortOnUpload,
-                renderType.setupState,
-                renderType.clearState
+            renderType::setupRenderState,
+            renderType::clearRenderState
         );
 
         this.renderType = renderType;

src/main/java/com/github/argon4w/acceleratedrendering/compat/iris/mixins/acceleratedrendering/RedirectingBufferSourceMixin.java

@@ -13,7 +13,7 @@
 @Mixin(RedirectingBufferSource.class)
 public class RedirectingBufferSourceMixin {
 
-    @WrapOperation(method = "getBuffer", at = @At(value = "FIELD", target = "Lnet/minecraft/client/renderer/RenderType;name:Ljava/lang/String;"))
+    @WrapOperation(method = "getBuffer", at = @At(value = "INVOKE", target = "Lnet/minecraft/client/renderer/RenderType;toString()Ljava/lang/String;"))
     public String unwrapIrisRenderType(RenderType instance, Operation<String> original) {
         if (!IrisCompatFeature.isEnabled()) {
             return original.call(instance);

src/main/java/com/github/argon4w/acceleratedrendering/compat/iris/mixins/acceleratedrendering/RedirectingOutlineBufferSourceMixin.java

@@ -13,7 +13,7 @@
 @Mixin(RedirectingOutlineBufferSource.class)
 public class RedirectingOutlineBufferSourceMixin {
 
-    @WrapOperation(method = "getBuffer", at = @At(value = "FIELD", target = "Lnet/minecraft/client/renderer/RenderType;name:Ljava/lang/String;"))
+    @WrapOperation(method = "getBuffer", at = @At(value = "INVOKE", target = "Lnet/minecraft/client/renderer/RenderType;toString()Ljava/lang/String;"))
     public String unwrapIrisRenderType(RenderType instance, Operation<String> original) {
         if (!IrisCompatFeature.isEnabled()) {
             return original.call(instance);

src/main/java/com/github/argon4w/acceleratedrendering/core/buffers/accelerated/AcceleratedBufferSource.java

@@ -9,9 +9,9 @@
 import com.mojang.blaze3d.vertex.VertexFormat;
 import it.unimi.dsi.fastutil.objects.Object2ObjectLinkedOpenHashMap;
 import net.minecraft.client.Minecraft;
+import net.minecraft.client.renderer.CompiledShaderProgram;
 import net.minecraft.client.renderer.MultiBufferSource;
 import net.minecraft.client.renderer.RenderType;
-import net.minecraft.client.renderer.ShaderInstance;
 
 import java.util.Map;
 
@@ -114,7 +114,7 @@ public void drawBuffers() {
             bufferSet.bindDrawBuffers();
             bufferEnvironment.setupBufferState();
 
-            ShaderInstance shader = RenderSystem.getShader();
+            CompiledShaderProgram shader = RenderSystem.getShader();
 
             shader.setDefaultUniforms(mode,
                     RenderSystem.getModelViewMatrix(),

src/main/java/com/github/argon4w/acceleratedrendering/core/buffers/builders/AcceleratedBufferBuilder.java

@@ -9,7 +9,7 @@
 import com.mojang.blaze3d.vertex.VertexFormat;
 import com.mojang.blaze3d.vertex.VertexFormatElement;
 import net.minecraft.client.renderer.RenderType;
-import net.minecraft.util.FastColor;
+import net.minecraft.util.ARGB;
 import org.lwjgl.system.MemoryUtil;
 
 import java.nio.ByteBuffer;
@@ -39,9 +39,9 @@ public class AcceleratedBufferBuilder implements VertexConsumer, IVertexConsumer
     private int sharing;
 
     public AcceleratedBufferBuilder(
-            MappedBuffer elementBuffer,
-            AcceleratedBufferSetPool.BufferSet bufferSet,
-            RenderType renderType
+        MappedBuffer elementBuffer,
+        AcceleratedBufferSetPool.BufferSet bufferSet,
+        RenderType renderType
 
     ) {
         this.elementBuffer = elementBuffer;
@@ -68,36 +68,36 @@ public AcceleratedBufferBuilder(
 
     private void putElements(int size) {
         IntElementUtils.putElements(
-                mode,
-                elementBuffer,
-                bufferSet.getElement(size),
-                size
+            mode,
+            elementBuffer,
+            bufferSet.getElement(size),
+            size
         );
     }
 
     @Override
     public VertexConsumer addVertex(
-            PoseStack.Pose pPose,
-            float pX,
-            float pY,
-            float pZ
+        PoseStack.Pose pPose,
+        float pX,
+        float pY,
+        float pZ
     ) {
         beginTransform(pPose);
         return addVertex(
-                pX,
-                pY,
-                pZ
+            pX,
+            pY,
+            pZ
         );
     }
 
     @Override
     public VertexConsumer addVertex(
-            float pX,
-            float pY,
-            float pZ
+        float pX,
+        float pY,
+        float pZ
     ) {
-        vertexCount ++;
-        elementCount ++;
+        vertexCount++;
+        elementCount++;
 
         if (elementCount >= polygonSize) {
             putElements(polygonSize);
@@ -120,10 +120,10 @@ public VertexConsumer addVertex(
 
     @Override
     public VertexConsumer setColor(
-            int pRed,
-            int pGreen,
-            int pBlue,
-            int pAlpha
+        int pRed,
+        int pGreen,
+        int pBlue,
+        int pAlpha
     ) {
         if (colorOffset == -1) {
             return this;
@@ -191,17 +191,17 @@ public VertexConsumer setUv2(int pU, int pV) {
 
     @Override
     public VertexConsumer setNormal(
-            PoseStack.Pose pPose,
-            float pNormalX,
-            float pNormalY,
-            float pNormalZ
+        PoseStack.Pose pPose,
+        float pNormalX,
+        float pNormalY,
+        float pNormalZ
     ) {
         if (transform == -1) {
             return VertexConsumer.super.setNormal(
-                    pPose,
-                    pNormalX,
-                    pNormalY,
-                    pNormalZ
+                pPose,
+                pNormalX,
+                pNormalY,
+                pNormalZ
             );
         }
 
@@ -210,17 +210,17 @@ public VertexConsumer setNormal(
         }
 
         return setNormal(
-                pNormalX,
-                pNormalY,
-                pNormalZ
+            pNormalX,
+            pNormalY,
+            pNormalZ
         );
     }
 
     @Override
     public VertexConsumer setNormal(
-            float pNormalX,
-            float pNormalY,
-            float pNormalZ
+        float pNormalX,
+        float pNormalY,
+        float pNormalZ
     ) {
         if (normalOffset == -1) {
             return this;
@@ -239,20 +239,20 @@ public VertexConsumer setNormal(
 
     @Override
     public void addVertex(
-            float pX,
-            float pY,
-            float pZ,
-            int pColor,
-            float pU,
-            float pV,
-            int pPackedOverlay,
-            int pPackedLight,
-            float pNormalX,
-            float pNormalY,
-            float pNormalZ
+        float pX,
+        float pY,
+        float pZ,
+        int pColor,
+        float pU,
+        float pV,
+        int pPackedOverlay,
+        int pPackedLight,
+        float pNormalX,
+        float pNormalY,
+        float pNormalZ
     ) {
         vertexCount++;
-        elementCount ++;
+        elementCount++;
 
         if (elementCount >= polygonSize) {
             putElements(polygonSize);
@@ -281,7 +281,7 @@ public void addVertex(
 
         MemoryUtil.memPutInt(varying + 0L * 4L, 0);
         MemoryUtil.memPutInt(varying + 1L * 4L, -1);
-        MemoryUtil.memPutInt(varying + 2L * 4L, FastColor.ABGR32.fromArgb32(pColor));
+        MemoryUtil.memPutInt(varying + 2L * 4L, ARGB.toABGR(pColor));
         MemoryUtil.memPutInt(varying + 3L * 4L, pPackedLight);
         MemoryUtil.memPutInt(varying + 4L * 4L, pPackedOverlay);
     }
@@ -318,12 +318,12 @@ public void endTransform() {
 
     @Override
     public void addClientMesh(
-            RenderType renderType,
-            ByteBuffer vertexBuffer,
-            int size,
-            int color,
-            int light,
-            int overlay
+        RenderType renderType,
+        ByteBuffer vertexBuffer,
+        int size,
+        int color,
+        int light,
+        int overlay
     ) {
         putElements(size);
         vertexCount += size;
@@ -333,13 +333,13 @@ public void addClientMesh(
         long length = (long) size * bufferSet.getVertexSize();
 
         ByteBufferUtils.putByteBuffer(
-                vertexBuffer,
-                vertex,
-                length
+            vertexBuffer,
+            vertex,
+            length
         );
 
         MemoryUtil.memPutInt(varying + 1L * 4L, sharing);
-        MemoryUtil.memPutInt(varying + 2L * 4L, FastColor.ABGR32.fromArgb32(color));
+        MemoryUtil.memPutInt(varying + 2L * 4L, ARGB.toABGR(color));
         MemoryUtil.memPutInt(varying + 3L * 4L, light);
         MemoryUtil.memPutInt(varying + 4L * 4L, overlay);
 
@@ -350,12 +350,12 @@ public void addClientMesh(
 
     @Override
     public void addServerMesh(
-            RenderType renderType,
-            int offset,
-            int size,
-            int color,
-            int light,
-            int overlay
+        RenderType renderType,
+        int offset,
+        int size,
+        int color,
+        int light,
+        int overlay
     ) {
         putElements(size);
 
@@ -367,7 +367,7 @@ public void addServerMesh(
 
         MemoryUtil.memPutInt(mesh, offset / bufferSet.getVertexSize());
         MemoryUtil.memPutInt(varying + 1L * 4L, sharing);
-        MemoryUtil.memPutInt(varying + 2L * 4L, FastColor.ABGR32.fromArgb32(color));
+        MemoryUtil.memPutInt(varying + 2L * 4L, ARGB.toABGR(color));
         MemoryUtil.memPutInt(varying + 3L * 4L, light);
         MemoryUtil.memPutInt(varying + 4L * 4L, overlay);