Merge remote-tracking branch 'main/v1' into v1

Author: nextdayy

gradle/libs.versions.toml

@@ -20,7 +20,7 @@ copycat = "0.1.3"
 copycat-image-awt = "0.1.1"
 
 # Per version
-textile = "0.8.0"
+textile = "0.9.0"
 omnicore = "0.21.0"
 lwjgl = "3.3.3" # All downloaded by the isolated-lwjgl3-loader
 

minecraft/src/main/java/org/polyfrost/oneconfig/api/ui/v1/internal/BlurHandler.java

@@ -101,6 +101,10 @@ private boolean reloadBlur(Object gui) {
         // a one of ours, we should load our own blur!
         if (gui instanceof BlurScreen && ((BlurScreen) gui).hasBackgroundBlur()) {
             if (!isShaderActive()) {
+                //#if MC >= 1.21.4
+                //$$ if (true) return false;
+                //#endif
+
                 //#if FABRIC
                 //$$ ((org.polyfrost.oneconfig.internal.mixin.fabric.Mixin_LoadShaderInvoker_Fabric) MinecraftClient.getInstance().gameRenderer).invokeLoadShader(this.blurShader);
                 //#else
@@ -174,6 +178,9 @@ public boolean isShaderActive() {
     }
 
     private ShaderGroup getShaderGroup() {
+        //#if MC >= 1.21.4
+        //$$ if (true) return null;
+        //#endif
         return Minecraft.getMinecraft()
                 //#if MC >= 1.21.4
                 //$$ .getShaderLoader().loadPostEffect(this.blurShader, DefaultFramebufferSet.MAIN_ONLY);

minecraft/src/main/java/org/polyfrost/oneconfig/internal/OneConfig.java

@@ -139,22 +139,22 @@ private static void registerCommands() {
             OneConfigUI.INSTANCE.open();
             return 1;
         });
-        b.then(literal("updateCheck").executes(cmd -> {
-            Multithreading.submit(() -> OmniChat.showChatMessage(MavenUpdateChecker.oneconfig().hasUpdate() ? "Update available!" : "No updates available"));
+        b.then(literal("updateCheck").executes(ctx -> {
+            Multithreading.submit(() -> ctx.getSource().showMessage(MavenUpdateChecker.oneconfig().hasUpdate() ? "Update available!" : "No updates available"));
             return 1;
         }));
-        b.then(literal("locraw").executes(cmd -> {
-            cmd.getSource().showMessage(HypixelUtils.getLocation().toString());
+        b.then(literal("locraw").executes(ctx -> {
+            ctx.getSource().showMessage(HypixelUtils.getLocation().toString());
             return 1;
         }));
-        b.then(literal("hud").executes(cmd -> {
+        b.then(literal("hud").executes(ctx -> {
             Platform.screen().display(HudManager.INSTANCE.getWithEditor());
             return 1;
         }));
-        b.then(literal("delete").executes(cmd -> {
+        b.then(literal("delete").executes(ctx -> {
             OneConfigUI.INSTANCE.invalidateCache();
             ConfigVisualizer.INSTANCE.clearCache();
-            cmd.getSource().showMessage("Deleted OneConfig UI. Please make a report if you were having issues!");
+            ctx.getSource().showMessage("Deleted OneConfig UI. Please make a report if you were having issues!");
             return 1;
         }));