Merge branch 'dev' into conditional-ber

README.md

@@ -7,13 +7,13 @@ micro-stutter, while fixing many graphical issues in Minecraft.
 
 ### 📥 Installation
 
-The latest releases of Sodium are published to our official [Modrinth](https://modrinth.com/mod/sodium) and
-[GitHub release](https://github.com/CaffeineMC/sodium-fabric/releases) pages. These releases are considered by our
-team to be suitable for general use, but they are not guaranteed to be free of bugs and other issues.
+The latest version of Sodium can be downloaded from our official [Modrinth](https://modrinth.com/mod/sodium) and
+[CurseForge](https://www.curseforge.com/minecraft/mc-mods/sodium) pages. 
 
-For more information about downloading and installing the mod, you can read our installation guide on
-[Modrinth](https://modrinth.com/mod/sodium#installation).
-It also contains information about any currently known compatibility issues, which are often useful to read.
+Since the release of Sodium 0.6.0, both the _Fabric_ and _NeoForge_ mod loaders are supported. We generally recommend
+that new users prefer to use the _Fabric_ mod loader, since it is more lightweight and stable (for the time being.)
+
+For more information about downloading and installing the mod, please refer to our [Installation Guide](https://github.com/CaffeineMC/sodium-fabric/wiki/Installation).
 
 ### 🐛 Reporting Issues
 
@@ -78,5 +78,5 @@ repositories.
 
 ## 📜 License
 
-Except where otherwise stated, the content of this repository is provided under the [Polyform Shield 1.0.0](LICENSE.md)
-license by [JellySquid](https://jellysquid.me).
+Except where otherwise stated (see [third-party license notices](thirdparty/NOTICE.txt)), the content of this repository is provided
+under the [Polyform Shield 1.0.0](LICENSE.md) license by [JellySquid](https://jellysquid.me).

build.gradle.kts

@@ -12,7 +12,7 @@ val FABRIC_API_VERSION by extra { "0.101.0+1.21" }
 val PARCHMENT_VERSION by extra { "2024.07.28" }
 
 // https://semver.org/
-val MOD_VERSION by extra { "0.6.0" }
+val MOD_VERSION by extra { "0.6.0-beta.1" }
 
 allprojects {
     apply(plugin = "java")

common/src/api/java/net/caffeinemc/mods/sodium/api/vertex/buffer/VertexBufferWriter.java

@@ -1,8 +1,8 @@
 package net.caffeinemc.mods.sodium.api.vertex.buffer;
 
 import com.mojang.blaze3d.vertex.VertexConsumer;
+import com.mojang.blaze3d.vertex.VertexFormat;
 import net.caffeinemc.mods.sodium.api.memory.MemoryIntrinsics;
-import net.caffeinemc.mods.sodium.api.vertex.format.VertexFormatDescription;
 import org.jetbrains.annotations.Nullable;
 import org.lwjgl.system.MemoryStack;
 
@@ -61,7 +61,7 @@ private static RuntimeException createUnsupportedVertexConsumerThrowable(VertexC
      * @param count  The number of vertices to copy
      * @param format The format of the vertices
      */
-    void push(MemoryStack stack, long ptr, int count, VertexFormatDescription format);
+    void push(MemoryStack stack, long ptr, int count, VertexFormat format);
 
     /**
      * If this {@link VertexBufferWriter} passes through data to nested {@link VertexConsumer} implementations,
@@ -86,9 +86,9 @@ default boolean canUseIntrinsics() {
      */
     static void copyInto(VertexBufferWriter writer,
                          MemoryStack stack, long ptr, int count,
-                         VertexFormatDescription format)
+                         VertexFormat format)
     {
-        var length = count * format.stride();
+        var length = count * format.getVertexSize();
         var copy = stack.nmalloc(length);
 
         MemoryIntrinsics.copyMemory(ptr, copy, length);

common/src/api/java/net/caffeinemc/mods/sodium/api/vertex/format/VertexFormatExtensions.java

@@ -0,0 +1,9 @@
+package net.caffeinemc.mods.sodium.api.vertex.format;
+
+public interface VertexFormatExtensions {
+    /**
+     * Returns an integer identifier that represents this vertex format in the global namespace. These identifiers
+     * are valid only for the current process lifetime and should not be saved to disk.
+     */
+    int sodium$getGlobalId();
+}

common/src/api/java/net/caffeinemc/mods/sodium/api/vertex/format/VertexFormatRegistry.java

@@ -11,5 +11,5 @@ static VertexFormatRegistry instance() {
         return INSTANCE;
     }
 
-    VertexFormatDescription get(VertexFormat format);
+    int allocateGlobalId(VertexFormat format);
 }

common/src/api/java/net/caffeinemc/mods/sodium/api/vertex/format/common/ColorVertex.java

@@ -1,16 +1,14 @@
 package net.caffeinemc.mods.sodium.api.vertex.format.common;
 
 import com.mojang.blaze3d.vertex.DefaultVertexFormat;
+import com.mojang.blaze3d.vertex.VertexFormat;
 import net.caffeinemc.mods.sodium.api.math.MatrixHelper;
 import net.caffeinemc.mods.sodium.api.vertex.attributes.common.ColorAttribute;
 import net.caffeinemc.mods.sodium.api.vertex.attributes.common.PositionAttribute;
-import net.caffeinemc.mods.sodium.api.vertex.format.VertexFormatDescription;
-import net.caffeinemc.mods.sodium.api.vertex.format.VertexFormatRegistry;
 import org.joml.Matrix4f;
 
 public final class ColorVertex {
-    public static final VertexFormatDescription FORMAT = VertexFormatRegistry.instance()
-            .get(DefaultVertexFormat.POSITION_COLOR);
+    public static final VertexFormat FORMAT = DefaultVertexFormat.POSITION_COLOR;
 
     public static final int STRIDE = 16;
 

common/src/api/java/net/caffeinemc/mods/sodium/api/vertex/format/common/ModelVertex.java → common/src/api/java/net/caffeinemc/mods/sodium/api/vertex/format/common/EntityVertex.java

@@ -1,13 +1,11 @@
 package net.caffeinemc.mods.sodium.api.vertex.format.common;
 
 import com.mojang.blaze3d.vertex.DefaultVertexFormat;
+import com.mojang.blaze3d.vertex.VertexFormat;
 import net.caffeinemc.mods.sodium.api.vertex.attributes.common.*;
-import net.caffeinemc.mods.sodium.api.vertex.format.VertexFormatDescription;
-import net.caffeinemc.mods.sodium.api.vertex.format.VertexFormatRegistry;
 
-public final class ModelVertex {
-    public static final VertexFormatDescription FORMAT = VertexFormatRegistry.instance()
-            .get(DefaultVertexFormat.NEW_ENTITY);
+public final class EntityVertex {
+    public static final VertexFormat FORMAT = DefaultVertexFormat.NEW_ENTITY;
 
     public static final int STRIDE = 36;
 

common/src/api/java/net/caffeinemc/mods/sodium/api/vertex/format/common/GlyphVertex.java

@@ -1,16 +1,14 @@
 package net.caffeinemc.mods.sodium.api.vertex.format.common;
 
 import com.mojang.blaze3d.vertex.DefaultVertexFormat;
+import com.mojang.blaze3d.vertex.VertexFormat;
 import net.caffeinemc.mods.sodium.api.vertex.attributes.common.ColorAttribute;
 import net.caffeinemc.mods.sodium.api.vertex.attributes.common.LightAttribute;
 import net.caffeinemc.mods.sodium.api.vertex.attributes.common.PositionAttribute;
-import net.caffeinemc.mods.sodium.api.vertex.format.VertexFormatDescription;
-import net.caffeinemc.mods.sodium.api.vertex.format.VertexFormatRegistry;
 import net.caffeinemc.mods.sodium.api.vertex.attributes.common.TextureAttribute;
 
 public final class GlyphVertex  {
-    public static final VertexFormatDescription FORMAT = VertexFormatRegistry.instance()
-            .get(DefaultVertexFormat.POSITION_COLOR_TEX_LIGHTMAP);
+    public static final VertexFormat FORMAT = DefaultVertexFormat.POSITION_COLOR_TEX_LIGHTMAP;
 
     public static final int STRIDE = 28;
 

common/src/api/java/net/caffeinemc/mods/sodium/api/vertex/format/common/LineVertex.java

@@ -1,15 +1,13 @@
 package net.caffeinemc.mods.sodium.api.vertex.format.common;
 
 import com.mojang.blaze3d.vertex.DefaultVertexFormat;
+import com.mojang.blaze3d.vertex.VertexFormat;
 import net.caffeinemc.mods.sodium.api.vertex.attributes.common.ColorAttribute;
 import net.caffeinemc.mods.sodium.api.vertex.attributes.common.NormalAttribute;
 import net.caffeinemc.mods.sodium.api.vertex.attributes.common.PositionAttribute;
-import net.caffeinemc.mods.sodium.api.vertex.format.VertexFormatDescription;
-import net.caffeinemc.mods.sodium.api.vertex.format.VertexFormatRegistry;
 
 public final class LineVertex  {
-    public static final VertexFormatDescription FORMAT = VertexFormatRegistry.instance()
-            .get(DefaultVertexFormat.POSITION_COLOR_NORMAL);
+    public static final VertexFormat FORMAT = DefaultVertexFormat.POSITION_COLOR_NORMAL;
 
     public static final int STRIDE = 20;
 

common/src/api/java/net/caffeinemc/mods/sodium/api/vertex/format/common/ParticleVertex.java

@@ -1,16 +1,14 @@
 package net.caffeinemc.mods.sodium.api.vertex.format.common;
 
 import com.mojang.blaze3d.vertex.DefaultVertexFormat;
+import com.mojang.blaze3d.vertex.VertexFormat;
 import net.caffeinemc.mods.sodium.api.vertex.attributes.common.ColorAttribute;
 import net.caffeinemc.mods.sodium.api.vertex.attributes.common.LightAttribute;
 import net.caffeinemc.mods.sodium.api.vertex.attributes.common.PositionAttribute;
-import net.caffeinemc.mods.sodium.api.vertex.format.VertexFormatDescription;
-import net.caffeinemc.mods.sodium.api.vertex.format.VertexFormatRegistry;
 import net.caffeinemc.mods.sodium.api.vertex.attributes.common.TextureAttribute;
 
 public final class ParticleVertex {
-    public static final VertexFormatDescription FORMAT = VertexFormatRegistry.instance()
-            .get(DefaultVertexFormat.PARTICLE);
+    public static final VertexFormat FORMAT = DefaultVertexFormat.PARTICLE;
 
     public static final int STRIDE = 28;
 

common/src/api/java/net/caffeinemc/mods/sodium/api/vertex/serializer/VertexSerializerRegistry.java

@@ -1,7 +1,7 @@
 package net.caffeinemc.mods.sodium.api.vertex.serializer;
 
+import com.mojang.blaze3d.vertex.VertexFormat;
 import net.caffeinemc.mods.sodium.api.internal.DependencyInjection;
-import net.caffeinemc.mods.sodium.api.vertex.format.VertexFormatDescription;
 
 public interface VertexSerializerRegistry {
     VertexSerializerRegistry INSTANCE = DependencyInjection.load(VertexSerializerRegistry.class,
@@ -11,5 +11,7 @@ static VertexSerializerRegistry instance() {
         return INSTANCE;
     }
 
-    VertexSerializer get(VertexFormatDescription srcFormat, VertexFormatDescription dstFormat);
+    VertexSerializer get(VertexFormat srcFormat, VertexFormat dstFormat);
+
+    void registerSerializer(VertexFormat srcFormat, VertexFormat dstFormat, VertexSerializer serializer);
 }

common/src/main/java/net/caffeinemc/mods/sodium/client/data/config/MixinConfig.java

@@ -49,6 +49,8 @@ protected MixinConfig() {
 
         this.addMixinRule("features.render", true);
 
+        this.addMixinRule("features.render.compositing", true);
+
         this.addMixinRule("features.render.entity", true);
         this.addMixinRule("features.render.entity.cull", true);
         this.addMixinRule("features.render.entity.shadow", true);
@@ -208,7 +210,7 @@ public static MixinConfig load(File file) {
 
         MixinConfig config = new MixinConfig();
         config.readProperties(props);
-        PlatformMixinOverrides.getInstance().applyModOverrides();
+        PlatformMixinOverrides.getInstance().applyModOverrides().forEach(config::applyModOverride);
 
         return config;
     }

common/src/main/java/net/caffeinemc/mods/sodium/client/gl/attribute/GlVertexAttributeFormat.java

@@ -7,6 +7,9 @@
  */
 public record GlVertexAttributeFormat(int typeId, int size) {
     public static final GlVertexAttributeFormat FLOAT = new GlVertexAttributeFormat(GL33C.GL_FLOAT, 4);
+    public static final GlVertexAttributeFormat INT = new GlVertexAttributeFormat(GL33C.GL_INT, 4);
+    public static final GlVertexAttributeFormat SHORT = new GlVertexAttributeFormat(GL33C.GL_SHORT, 2);
+    public static final GlVertexAttributeFormat BYTE = new GlVertexAttributeFormat(GL33C.GL_BYTE, 1);
     public static final GlVertexAttributeFormat UNSIGNED_SHORT = new GlVertexAttributeFormat(GL33C.GL_UNSIGNED_SHORT, 2);
     public static final GlVertexAttributeFormat UNSIGNED_BYTE = new GlVertexAttributeFormat(GL33C.GL_UNSIGNED_BYTE, 1);
     public static final GlVertexAttributeFormat UNSIGNED_INT = new GlVertexAttributeFormat(GL33C.GL_UNSIGNED_INT, 4);