Switch to official-like and build on all versions

Author: Deftu

build.gradle.kts

@@ -17,8 +17,8 @@ plugins {
 
 toolkitLoomHelper {
     useOneConfig {
-        version = "1.0.0-alpha.163"
-        loaderVersion = "1.1.0-alpha.49"
+        version = "1.0.0-alpha.177"
+        loaderVersion = "1.1.0-alpha.53"
 
         usePolyMixin = true
         polyMixinVersion = "0.8.4+build.7"

gradle.properties

@@ -1,13 +1,37 @@
-# Gradle Configuration -- DO NOT TOUCH THESE VALUES.
-polyfrost.defaults.loom=3
-org.gradle.daemon=true
-org.gradle.parallel=true
-org.gradle.configureoncommand=true
-org.gradle.parallel.threads=4
-org.gradle.jvmargs=-Xmx2G
-loom.ignoreDependencyLoomVersionValidation=true
-
+### Mod Properties ###
+# The name used to produce your mod's JAR file, also appearing in Bloom processed files and the mod's metadata.
 mod.name=ColorSaturation
+# Your mod's ID, which is used in the mod's metadata and for identifying the mod in the game. Must be unique from other mods.
 mod.id=colorsaturation
+# The version of your mod, which is used in the mod's metadata and for version checks.
 mod.version=1.1.0-alpha.1
-mod.group=org.polyfrost
+# The Maven group ID for your mod, which is used in the mod's metadata and for dependency management.
+mod.group=org.polyfrost
+######################
+
+### DGT Configuration ###
+# Switches the mappings for all our versions to use MCP and mojmap.
+dgt.loom.mappings=official-like
+# Sets the DGT automatic Minecraft dependency list to revision 3. Update this to latest if you want to use the latest recommended versions of libraries.
+dgt.minecraft.revision=3
+#########################
+
+#####################################################################################
+### DO NOT EDIT THE PROPERTIES BELOW THIS LINE UNLESS YOU KNOW WHAT YOU ARE DOING ###
+#####################################################################################
+
+### Gradle Configuration ###
+# Sets JVM arguments for Gradle to improve performance and stability.
+# Adjust memory settings as needed based on your system's capabilities.
+# If you're supporting the template's full version range, do not reduce these values any further, they're already quite low.
+org.gradle.jvmargs=-Xmx6144m -Dfile.encoding=UTF-8
+############################
+
+### Loom Configuration ###
+# Allows us to use dependencies built with newer Loom by ignoring that it was built against a differing Loom version.
+# This is absolutely necessary because we use an older fork of Loom to enable Legacy Forge support.
+# As far as can be seen, there are absolutely no negative side effects to doing this. If you encounter any,
+# feel free to report them to the template's issue tracker and comment this line out to see if it resolves them.
+# You won't be able to use any dependencies built by newer Loom without this line, however.
+loom.ignoreDependencyLoomVersionValidation=true
+##########################

…in_EntityRenderer_SaturationHandler.java …/mixin/client/Mixin_ApplySaturation.javasrc/main/java/org/polyfrost/colorsaturation/mixin/client/Mixin_EntityRenderer_SaturationHandler.java renamed to src/main/java/org/polyfrost/colorsaturation/mixin/client/Mixin_ApplySaturation.java src/main/java/org/polyfrost/colorsaturation/mixin/client/Mixin_EntityRenderer_SaturationHandler.java renamed to src/main/java/org/polyfrost/colorsaturation/mixin/client/Mixin_ApplySaturation.java

@@ -12,10 +12,10 @@
 import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable;
 
 //#if MC >= 1.21.2
+//$$ import com.mojang.blaze3d.resource.CrossFrameResourcePool;
 //$$ import com.mojang.blaze3d.systems.RenderSystem;
 //$$ import dev.deftu.omnicore.api.client.OmniClient;
-//$$ import net.minecraft.client.MinecraftClient;
-//$$ import net.minecraft.client.util.Pool;
+//$$ import net.minecraft.client.Minecraft;
 //$$ import org.spongepowered.asm.mixin.Final;
 //$$ import org.spongepowered.asm.mixin.Shadow;
 //#else
@@ -27,20 +27,18 @@
 //#endif
 
 @Mixin(EntityRenderer.class)
-public class Mixin_EntityRenderer_SaturationHandler {
+public class Mixin_ApplySaturation {
     //#if MC >= 1.21.2
-    //$$ @Shadow private MinecraftClient client;
-    //$$ @Shadow @Final private Pool pool;
+    //$$ @Shadow private Minecraft minecraft;
+    //$$ @Shadow @Final private CrossFrameResourcePool resourcePool;
     //#endif
 
     //#if MC < 1.16.5
     @Inject(method = "isShaderActive", at = @At("HEAD"), cancellable = true)
     private void colorsaturation$cancelShaderActive(CallbackInfoReturnable<Boolean> cir) {
-        if (!SaturationHandler.isActive()) {
-            return;
+        if (SaturationHandler.isActive()) {
+            cir.setReturnValue(true);
         }
-
-        cir.setReturnValue(true);
     }
     //#endif
 
@@ -54,7 +52,7 @@ public class Mixin_EntityRenderer_SaturationHandler {
             //#if MC >= 1.21.2
             //$$ at = @At(
             //$$     value = "INVOKE",
-            //$$     target = "Lnet/minecraft/client/render/WorldRenderer;drawEntityOutlinesFramebuffer()V"
+            //$$     target = "Lnet/minecraft/client/renderer/LevelRenderer;doEntityOutline()V"
             //$$ )
             //#else
             at = @At(
@@ -80,15 +78,15 @@ public class Mixin_EntityRenderer_SaturationHandler {
         }
 
         //#if MC >= 1.21.2
-        //$$ if (!OmniClient.get().isFinishedLoading() || OmniClient.getWorld() == null) {
+        //$$ if (!OmniClient.get().isGameLoadFinished() || OmniClient.getWorld() == null) {
         //$$     return;
         //$$ }
         //#endif
 
         OmniClientProfiler.withProfiler(OmniClient.get(), "colorsaturation_applier", () -> {
             //#if MC >= 1.21.2
             //$$ RenderSystem.resetTextureMatrix();
-            //$$ SaturationHandler.render(this.client.getFramebuffer(), this.pool);
+            //$$ SaturationHandler.render(this.minecraft.getMainRenderTarget(), this.resourcePool);
             //#else
             SaturationHandler.update();
             float trueTickDelta = OmniRenderTicks.get();

src/main/kotlin/org/polyfrost/colorsaturation/client/SaturationHandler.kt

@@ -3,15 +3,15 @@ package org.polyfrost.colorsaturation.client
 import dev.deftu.omnicore.api.DEFAULT_NAMESPACE
 import dev.deftu.omnicore.api.client.client
 import dev.deftu.omnicore.api.client.render.GlCapabilities
-import dev.deftu.omnicore.api.identifierOrThrow
+import dev.deftu.omnicore.api.locationOrThrow
 import net.minecraft.client.shader.ShaderGroup
 import org.apache.logging.log4j.LogManager
 import org.polyfrost.oneconfig.internal.mixin.Mixin_ShaderListAccessor
 
 object SaturationHandler {
     private val LOGGER = LogManager.getLogger(SaturationHandler::class.java)
 
-    private val LOCATION by lazy { identifierOrThrow(DEFAULT_NAMESPACE, "shaders/post/color_saturation.json") }
+    private val LOCATION by lazy { locationOrThrow(DEFAULT_NAMESPACE, "shaders/post/color_saturation.json") }
 
     private var shader: ShaderGroup? = null
     private var prevWidth = 0

src/main/resources/mixins.colorsaturation.json

@@ -10,8 +10,7 @@
         "client.compat.BlurHandlerMixin",
         "client.compat.BlurModMixin",
         "client.compat.OptifineConfigMixin",
-
-        "client.Mixin_EntityRenderer_SaturationHandler"
+        "client.Mixin_ApplySaturation"
     ],
     "verbose": true
 }

versions/1.21.4-neoforge/src/main/kotlin/org/polyfrost/colorsaturation/client/SaturationHandler.kt

@@ -0,0 +1,64 @@
+package org.polyfrost.colorsaturation.client
+
+import com.google.gson.JsonSyntaxException
+import com.mojang.blaze3d.framegraph.FrameGraphBuilder
+import com.mojang.blaze3d.pipeline.RenderTarget
+import com.mojang.blaze3d.resource.CrossFrameResourcePool
+import dev.deftu.omnicore.api.client.client
+import dev.deftu.omnicore.api.locationOrThrow
+import net.minecraft.client.renderer.LevelTargetBundle
+import net.minecraft.client.renderer.PostChain
+import org.apache.logging.log4j.LogManager
+import org.polyfrost.colorsaturation.ColorSaturationConstants
+
+//#if MC >= 1.21.5
+//$$ import com.mojang.blaze3d.systems.RenderPass
+//$$ import java.util.function.Consumer
+//#endif
+
+object SaturationHandler {
+    private val LOGGER = LogManager.getLogger(SaturationHandler::class.java)
+
+    private val LOCATION by lazy { locationOrThrow(ColorSaturationConstants.ID, "color_saturation") }
+
+    @JvmStatic
+    val isActive: Boolean
+        get() = ColorSaturationConfig.isEnabled
+
+    @JvmStatic
+    fun render(renderTarget: RenderTarget, resourcePool: CrossFrameResourcePool) {
+        if (!isActive) {
+            return
+        }
+
+        val shader = try {
+            client.shaderManager.getPostChain(LOCATION, LevelTargetBundle.MAIN_TARGETS)
+        } catch (e: JsonSyntaxException) {
+            LOGGER.error("Could not load motion blur: ", e)
+            null
+        }
+
+        //#if MC >= 1.21.5
+        //$$ val consumer = Consumer { renderPass: RenderPass ->
+        //$$     renderPass.setUniform("Saturation", ColorSaturationConfig.strength)
+        //$$ }
+        //#else
+        shader?.setUniform("Saturation", ColorSaturationConfig.strength)
+        //#endif
+
+        val builder = FrameGraphBuilder()
+        shader?.addToFrame(
+            builder,
+            renderTarget.viewWidth, renderTarget.viewHeight,
+            PostChain.TargetBundle.of(
+                PostChain.MAIN_TARGET_ID,
+                builder.importExternal("main", renderTarget)
+            ),
+            //#if MC >= 1.21.5
+            //$$ consumer,
+            //#endif
+        )
+
+        builder.execute(resourcePool)
+    }
+}

…ration/post_effect/color_saturation.json …ration/post_effect/color_saturation.jsonversions/1.21.5-fabric/src/main/resources/assets/colorsaturation/post_effect/color_saturation.json renamed to versions/1.21.4-neoforge/src/main/resources/assets/colorsaturation/post_effect/color_saturation.json versions/1.21.5-fabric/src/main/resources/assets/colorsaturation/post_effect/color_saturation.json renamed to versions/1.21.4-neoforge/src/main/resources/assets/colorsaturation/post_effect/color_saturation.json

@@ -9,17 +9,17 @@ import com.mojang.blaze3d.shaders.UniformType
 import com.mojang.blaze3d.systems.RenderSystem
 import com.mojang.blaze3d.vertex.DefaultVertexFormat
 import com.mojang.blaze3d.vertex.VertexFormat
-import dev.deftu.omnicore.api.identifierOrThrow
+import dev.deftu.omnicore.api.locationOrThrow
 import org.polyfrost.colorsaturation.ColorSaturationConstants
 import java.util.OptionalInt
 import kotlin.use
 
 object SaturationHandler {
     private val pipeline by lazy {
         RenderPipeline.builder()
-            .withLocation(identifierOrThrow(ColorSaturationConstants.ID, "saturation_pipeline"))
+            .withLocation(locationOrThrow(ColorSaturationConstants.ID, "saturation_pipeline"))
             .withVertexShader("core/blit_screen")
-            .withFragmentShader(identifierOrThrow(ColorSaturationConstants.ID, "post/color_saturation"))
+            .withFragmentShader(locationOrThrow(ColorSaturationConstants.ID, "post/color_saturation"))
             .withVertexFormat(DefaultVertexFormat.POSITION, VertexFormat.Mode.QUADS)
             .withDepthWrite(false)
             .withDepthTestFunction(DepthTestFunction.NO_DEPTH_TEST)