version: 1.21.5

.gitignore

@@ -1,5 +1,6 @@
 .idea/*
 !.idea/copyright/
+!.idea/codeInsightSettings.xml
 *.iml
 *.ipr
 *.iws

build.gradle.kts

@@ -27,7 +27,7 @@ plugins {
     id("fabric-loom")
     kotlin("jvm")
     id("com.gorylenko.gradle-git-properties") version "2.5.3"
-    id("io.gitlab.arturbosch.detekt") version "1.23.6"
+    id("io.gitlab.arturbosch.detekt") version "1.23.8"
     id("com.github.node-gradle.node") version "7.1.0"
     id("org.jetbrains.dokka") version "2.1.0"
 }

config/detekt/detekt.yml

@@ -45,6 +45,8 @@ exceptions:
 style:
 #  UnusedImports:
 #    active: true
+  DestructuringDeclarationWithTooManyEntries:
+    maxDestructuringEntries: 4
   MagicNumber:
     active: false
   ReturnCount:
@@ -62,6 +64,8 @@ style:
     allowedNames: '_|ignored|expected|serialVersionUID|.+Handler\d*|repeatable'
   ForbiddenMethodCall:
     active: true
+    methods: ['kotlin.io.print', 'kotlin.io.println', 'java.math.BigDecimal.<init>(kotlin.Double)', 'java.math.BigDecimal.<init>(kotlin.String)', 'kotlin.system.measureTimeMillis', 'org.lwjgl.opengl.GL11.glBindTexture']
+    # glBindTexture: replace with GlStateManager._bindTexture(), because everything else will mess up the internal state handling.
   BracesOnIfStatements:
     active: true
     singleLine: 'never'

gradle.properties

@@ -34,13 +34,13 @@ org.jetbrains.dokka.experimental.gradle.pluginMode=V2EnabledWithHelpers
 
 # Fabric Properties
 # Check these on https://fabricmc.net/versions.html
-minecraft_version=1.21.4
-yarn_mappings=1.21.4+build.8
+minecraft_version=1.21.5
+yarn_mappings=1.21.5+build.1
 loader_version=0.17.2
 min_loader_version=0.16.14
 
 # Fabric API
-fabric_version=0.119.4+1.21.4
+fabric_version=0.128.2+1.21.5
 # Loom
 loom_version=1.11-SNAPSHOT
 # Mod Properties
@@ -55,20 +55,20 @@ kotlinx_coroutines_version=1.10.2
 # https://maven.fabricmc.net/net/fabricmc/fabric-language-kotlin/
 fabric_kotlin_version=1.13.5+kotlin.2.2.10
 # mcef
-mcef_version=3.1.2-1.21.4
+mcef_version=dev~1.21.5-test-SNAPSHOT
 # mc-authlib
 mc_authlib_version=1.4.1
 # Polyglot
-polyglot_version=24.2.1
+polyglot_version=25.0.0
 # djl
 djl_version=0.34.0
 # https://mvnrepository.com/artifact/com.squareup.okhttp3/okhttp
 okhttp_version=5.1.0
 # Netty, should be sync with game version
 # https://mvnrepository.com/artifact/io.netty/netty-all
-netty_version=4.1.115.Final
+netty_version=4.1.118.Final
 # Recommended mods
-mod_menu_version=13.0.3
-sodium_version=mc1.21.4-0.6.13-fabric
-lithium_version=mc1.21.4-0.15.3-fabric
-viafabricplus_version=4.0.5-BACKPORT
+mod_menu_version=14.0.0-rc.2
+sodium_version=mc1.21.5-0.6.13-fabric
+lithium_version=mc1.21.5-0.16.3-fabric
+viafabricplus_version=4.1.5

gradle/wrapper/gradle-wrapper.properties

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

src/main/java/net/ccbluex/liquidbounce/common/ClientLogoTexture.java

@@ -38,9 +38,9 @@
  * Should be drawn using [CustomRenderPhase::getTextureBilinear] to make it look smoother.
  */
 @Environment(EnvType.CLIENT)
-public class ClientLogoTexture extends ReloadableTexture {
+public final class ClientLogoTexture extends ReloadableTexture {
 
-    public static final Identifier CLIENT_LOGO = Identifier.of("liquidbounce", "logo");
+    public static final Identifier CLIENT_LOGO = LiquidBounce.identifier("logo");
     public static final int WIDTH = 1920;
     public static final int HEIGHT = 721;
 

src/main/java/net/ccbluex/liquidbounce/common/GlobalFramebuffer.java

@@ -18,11 +18,13 @@
  */
 package net.ccbluex.liquidbounce.common;
 
+import com.mojang.blaze3d.opengl.GlConst;
+import com.mojang.blaze3d.opengl.GlStateManager;
+import it.unimi.dsi.fastutil.ints.IntArrayList;
+import it.unimi.dsi.fastutil.objects.ObjectArrayList;
+import net.ccbluex.liquidbounce.render.buffer.AbstractFramebuffer;
 import net.minecraft.client.MinecraftClient;
-import net.minecraft.client.gl.Framebuffer;
-
-import java.util.ArrayList;
-import java.util.List;
+import org.lwjgl.opengl.GL30;
 
 /**
  * Modifies {@link MinecraftClient#getFramebuffer()} to return an own framebuffer so that minecraft writes results
@@ -34,34 +36,104 @@ public final class GlobalFramebuffer {
 
     private GlobalFramebuffer() {}
 
-    private static final List<Framebuffer> stack = new ArrayList<>(2);
+    private static final IntArrayList readStack = new IntArrayList(2);
+    private static final IntArrayList writeStack = new IntArrayList(2);
+    private static final ObjectArrayList<AbstractFramebuffer> stack = new ObjectArrayList<>(1);
+
+    static {
+        readStack.add(0);
+        writeStack.add(0);
+    }
+
+    private static boolean lock;
+    private static boolean minecraftChangesRead;
+    private static boolean minecraftChangesWrite;
+
+    // framebuffers minecraft sets
+    public static void updateRead(int id) {
+        if (!minecraftChangesRead || id == readStack.getInt(0)) {
+            readStack.set(0, id);
+            minecraftChangesRead = false;
+        }
+
+        if (!lock || minecraftChangesRead) {
+            bindRead(id);
+        }
+    }
+
+    public static void updateWrite(int id) {
+        if (!minecraftChangesWrite || id == writeStack.getInt(0)) {
+            writeStack.set(0, id);
+            minecraftChangesWrite = false;
+        }
+
+        if (!lock || minecraftChangesWrite) {
+            bindWrite(id);
+        }
+    }
 
-    private static Framebuffer spoofedFramebuffer;
+    // when mc changes stuff at the framebuffer, they need to cache the current fbo
+    public static int getRead() {
+        minecraftChangesRead = true;
+        return readStack.getInt(0);
+    }
 
-    public static Framebuffer getSpoofedFramebuffer() {
-        return spoofedFramebuffer;
+    public static int getWrite() {
+        minecraftChangesWrite = true;
+        return writeStack.getInt(0);
     }
 
-    public static void push(Framebuffer spoofedFramebuffer) {
-        if (GlobalFramebuffer.spoofedFramebuffer != null) {
-            stack.addLast(GlobalFramebuffer.spoofedFramebuffer);
+    public static void push(AbstractFramebuffer spoofedFramebuffer) {
+        if (!stack.isEmpty() && stack.top() == spoofedFramebuffer) {
+            return;
         }
 
-        GlobalFramebuffer.spoofedFramebuffer = spoofedFramebuffer;
+        stack.push(spoofedFramebuffer);
+        readStack.push(spoofedFramebuffer.getId());
+        writeStack.push(spoofedFramebuffer.getId());
+        lock = true;
+
+        if (!minecraftChangesRead) {
+            bindRead(spoofedFramebuffer.getId());
+        }
+
+        if (!minecraftChangesWrite) {
+            bindWrite(spoofedFramebuffer.getId());
+        }
     }
 
     public static void pop() {
+        if (!readStack.isEmpty()) {
+            readStack.popInt();
+            if (!minecraftChangesRead) {
+                bindRead(readStack.topInt());
+            }
+        }
+
+        if (!writeStack.isEmpty()) {
+            writeStack.popInt();
+            if (!minecraftChangesWrite) {
+                bindWrite(writeStack.topInt());
+            }
+        }
+
+        if (!stack.isEmpty()) {
+            stack.pop();
+        }
+
         if (stack.isEmpty()) {
-            spoofedFramebuffer = null;
-            return;
+            lock = false;
         }
+    }
 
-        spoofedFramebuffer = stack.getLast();
+    private static void bindRead(int id) {
+        GlStateManager.readFbo = id;
+        GL30.glBindFramebuffer(GlConst.GL_READ_FRAMEBUFFER, id);
     }
 
-    public static void clear() {
-        stack.clear();
-        spoofedFramebuffer = null;
+    private static void bindWrite(int id) {
+        GlStateManager.writeFbo = id;
+        GL30.glBindFramebuffer(GlConst.GL_DRAW_FRAMEBUFFER, id);
     }
 
 }

src/main/java/net/ccbluex/liquidbounce/common/MapBackedFramebufferSet.java

@@ -0,0 +1,46 @@
+/*
+ * This file is part of LiquidBounce (https://github.com/CCBlueX/LiquidBounce)
+ *
+ * Copyright (c) 2015 - 2025 CCBlueX
+ *
+ * LiquidBounce is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * LiquidBounce is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with LiquidBounce. If not, see <https://www.gnu.org/licenses/>.
+ */
+
+package net.ccbluex.liquidbounce.common;
+
+import net.minecraft.client.gl.Framebuffer;
+import net.minecraft.client.gl.PostEffectProcessor;
+import net.minecraft.client.util.Handle;
+import net.minecraft.util.Identifier;
+
+import javax.annotation.Nullable;
+import java.util.HashMap;
+
+/**
+ * Stupid class, but Minecraft needed one more abstraction...
+ */
+public record MapBackedFramebufferSet(
+        HashMap<Identifier, Handle<Framebuffer>> backingMap
+) implements PostEffectProcessor.FramebufferSet {
+
+    @Override
+    public void set(Identifier id, Handle<Framebuffer> framebuffer) {
+        this.backingMap.put(id, framebuffer);
+    }
+
+    @Override
+    public @Nullable Handle<Framebuffer> get(Identifier id) {
+        return this.backingMap.get(id);
+    }
+}

src/main/java/net/ccbluex/liquidbounce/common/OutlineFlag.java

@@ -18,6 +18,6 @@
  */
 package net.ccbluex.liquidbounce.common;
 
-public class OutlineFlag {
+public final class OutlineFlag {
     public static boolean drawOutline = false;
 }