Bump to OneConfig A70

Author: Deftu

build.gradle.kts

@@ -1,7 +1,6 @@
 @file:Suppress("UnstableApiUsage", "PropertyName")
 
 import dev.deftu.gradle.utils.GameSide
-import dev.deftu.gradle.utils.MinecraftVersion
 
 plugins {
     java
@@ -18,7 +17,7 @@ plugins {
 
 toolkitLoomHelper {
     useOneConfig {
-        version = "1.0.0-alpha.62"
+        version = "1.0.0-alpha.70"
         loaderVersion = "1.1.0-alpha.44"
 
         usePolyMixin = true

gradle/wrapper/gradle-wrapper.properties

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

gradlew

@@ -55,7 +55,7 @@
 #       Darwin, MinGW, and NonStop.
 #
 #   (3) This script is generated from the Groovy template
-#       https://github.com/gradle/gradle/blob/HEAD/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
+#       https://github.com/gradle/gradle/blob/HEAD/platforms/jvm/plugins-application/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
 #       within the Gradle project.
 #
 #       You can find Gradle at https://github.com/gradle/gradle/.

settings.gradle.kts

@@ -24,7 +24,7 @@ pluginManagement {
 
     plugins {
         kotlin("jvm") version("2.0.0")
-        id("dev.deftu.gradle.multiversion-root") version("2.22.0")
+        id("dev.deftu.gradle.multiversion-root") version("2.27.1")
     }
 }
 

src/main/java/org/polyfrost/colorsaturation/Saturation.java

@@ -1,5 +1,8 @@
 package org.polyfrost.colorsaturation;
 
+import dev.deftu.omnicore.client.OmniClient;
+import dev.deftu.omnicore.client.render.OmniResolution;
+import dev.deftu.omnicore.client.render.OmniTextureManager;
 import net.minecraft.client.shader.Shader;
 import net.minecraft.client.shader.ShaderGroup;
 import net.minecraft.client.shader.ShaderUniform;
@@ -8,8 +11,6 @@
 import org.polyfrost.colorsaturation.mixin.ShaderGroupAccessor;
 import org.polyfrost.oneconfig.api.event.v1.events.RenderEvent;
 import org.polyfrost.oneconfig.api.event.v1.invoke.impl.Subscribe;
-import org.polyfrost.universal.UMinecraft;
-import org.polyfrost.universal.UResolution;
 
 import java.io.IOException;
 import java.util.List;
@@ -20,7 +21,7 @@ public class Saturation {
     private static final ResourceLocation phosphorBlur = new ResourceLocation("minecraft:shaders/post/color_convolve.json");
 
     @Subscribe
-    private void onRenderTick(RenderEvent.End event) {
+    private void onRenderTick(RenderEvent.Post event) {
         // Only update the shader if one is active
         if (!isShaderActive() || lastEnabled != ColorSaturation.getConfig().enabled) {
             lastEnabled = ColorSaturation.getConfig().enabled;
@@ -29,21 +30,21 @@ private void onRenderTick(RenderEvent.End event) {
     }
 
     public static void reloadShader() {
-        if (UMinecraft.getWorld() == null) {
+        if (!OmniClient.getHasWorld()) {
             return;
         }
 
         if (!isShaderActive() && ColorSaturation.getConfig().enabled) {
             try {
-                final ShaderGroup saturationShader = new ShaderGroup(UMinecraft.getMinecraft().getTextureManager(), UMinecraft.getMinecraft().getResourceManager(), UMinecraft.getMinecraft().getFramebuffer(), phosphorBlur);
-                saturationShader.createBindFramebuffers(UResolution.getWindowWidth(), UResolution.getWindowHeight());
-                ((EntityRendererHook) UMinecraft.getMinecraft().entityRenderer).colorSaturation$setSaturationShader(saturationShader);
+                final ShaderGroup saturationShader = new ShaderGroup(OmniTextureManager.get(), OmniClient.getInstance().getResourceManager(), OmniClient.getInstance().getFramebuffer(), phosphorBlur);
+                saturationShader.createBindFramebuffers(OmniResolution.getViewportWidth(), OmniResolution.getViewportHeight());
+                ((EntityRendererHook) OmniClient.getInstance().entityRenderer).colorSaturation$setSaturationShader(saturationShader);
                 reloadSaturation();
             } catch (IOException e) {
                 e.printStackTrace();
             }
         } else if (isShaderActive() && !ColorSaturation.getConfig().enabled) {
-            final EntityRendererHook entityRenderer = (EntityRendererHook) UMinecraft.getMinecraft().entityRenderer;
+            final EntityRendererHook entityRenderer = (EntityRendererHook) OmniClient.getInstance().entityRenderer;
             if (entityRenderer.colorSaturation$getSaturationShader() != null) {
                 entityRenderer.colorSaturation$getSaturationShader().deleteShaderGroup();
             }
@@ -54,7 +55,7 @@ public static void reloadShader() {
 
     public static void reloadSaturation() {
         try {
-            final List<Shader> listShaders = ((ShaderGroupAccessor) ((EntityRendererHook) UMinecraft.getMinecraft().entityRenderer).colorSaturation$getSaturationShader()).getListShaders();
+            final List<Shader> listShaders = ((ShaderGroupAccessor) ((EntityRendererHook) OmniClient.getInstance().entityRenderer).colorSaturation$getSaturationShader()).getListShaders();
 
             if (listShaders == null) {
                 return;
@@ -75,7 +76,7 @@ public static void reloadSaturation() {
     }
 
     private static boolean isShaderActive() {
-        return ((EntityRendererHook) UMinecraft.getMinecraft().entityRenderer).colorSaturation$getSaturationShader() != null
+        return ((EntityRendererHook) OmniClient.getInstance().entityRenderer).colorSaturation$getSaturationShader() != null
                 //#if MC<=11202
                 && net.minecraft.client.renderer.OpenGlHelper.shadersSupported
                 //#endif

src/main/java/org/polyfrost/colorsaturation/command/SaturationCommand.java

@@ -4,7 +4,7 @@
 import org.polyfrost.oneconfig.api.commands.v1.factories.annotated.Command;
 import org.polyfrost.oneconfig.utils.v1.dsl.ScreensKt;
 
-@Command(value = ColorSaturation.ID, description = "Access the " + ColorSaturation.NAME + " GUI.")
+@Command(ColorSaturation.ID)
 public class SaturationCommand {
     @Command
     private void main() {

src/main/java/org/polyfrost/colorsaturation/mixin/BlurModMixin.java

@@ -1,8 +1,8 @@
 package org.polyfrost.colorsaturation.mixin;
 
+import dev.deftu.omnicore.client.OmniClient;
 import net.minecraft.client.renderer.EntityRenderer;
 import org.polyfrost.colorsaturation.EntityRendererHook;
-import org.polyfrost.universal.UMinecraft;
 import org.spongepowered.asm.mixin.Dynamic;
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.Pseudo;
@@ -21,7 +21,7 @@ private boolean isShaderActive(EntityRenderer er) {
                         //#else
                         //$$ true
                         //#endif
-                        && ((EntityRendererHook) UMinecraft.getMinecraft().entityRenderer).colorSaturation$getSaturationShader() != null
+                        && ((EntityRendererHook) OmniClient.getInstance().entityRenderer).colorSaturation$getSaturationShader() != null
         ) {
             return false;
         }

src/main/kotlin/org/polyfrost/colorsaturation/ColorSaturation.kt

@@ -31,7 +31,7 @@ object ColorSaturation
 
     fun initialize() {
         config = SaturationConfig()
-        CommandManager.registerCommand(SaturationCommand())
+        CommandManager.register(SaturationCommand())
         EventManager.INSTANCE.register(Saturation())
     }