feat: first attempt at an actual extra slot

Author: HZbutcoding

extensions/extension/src/main/java/app/revanced/extension/ExampleExtension.java

@@ -0,0 +1,46 @@
+package app.revanced.extension.customfilters;
+
+import java.lang.reflect.Constructor;
+import java.lang.reflect.Method;
+
+public class TintFieldHook {
+    public static void installTintField(Object table) {
+        try {
+            ClassLoader cl = table.getClass().getClassLoader();
+
+            Class<?> appClass = Class.forName("org.fortheloss.sticknodes.App", false, cl);
+            Class<?> colorClass = Class.forName("com.badlogic.gdx.graphics.Color", false, cl);
+            Class<?> labelFieldClass = Class.forName("org.fortheloss.framework.LabelColorInputIncrementField", false, cl);
+            Class<?> figureFiltersClass = Class.forName("org.fortheloss.sticknodes.animationscreen.modules.tooltables.FigureFiltersToolTable", false, cl);
+
+            Constructor<?> ctor = labelFieldClass.getConstructor(
+                    android.content.Context.class,
+                    String.class, String.class, int.class,
+                    float.class, float.class, boolean.class
+            );
+
+            Method getModule = figureFiltersClass.getMethod("getModule");
+            Object module = getModule.invoke(table);
+            Method getContext = module.getClass().getMethod("getContext");
+            Object context = getContext.invoke(module);
+
+            Method localize = appClass.getMethod("localize", String.class);
+            String tintLabel = (String) localize.invoke(null, "tint");
+
+            Object field = ctor.newInstance(context, tintLabel, "0.00", 4, 0.0f, 1.0f, true);
+
+            Method registerWidget = figureFiltersClass.getMethod("registerWidget", Object.class, int.class);
+            registerWidget.invoke(table, field, 107);
+
+            Method setHighFidelity = labelFieldClass.getMethod("setHighFidelity", boolean.class);
+            setHighFidelity.invoke(field, true);
+
+            Object whiteColor = colorClass.getField("WHITE").get(null);
+            Method setValue = labelFieldClass.getMethod("setValue", colorClass);
+            setValue.invoke(field, whiteColor);
+
+        } catch (Throwable t) {
+            t.printStackTrace();
+        }
+    }
+}

extensions/extension/src/main/java/app/revanced/extension/customfilters/TintFieldHook.java

@@ -1,6 +1,5 @@
 public final class com/HZ/CustomFilters/CustomFiltersKt {
 	public static final fun getAddCustomFilterSlot ()Lapp/revanced/patcher/patch/BytecodePatch;
-	public static final fun getCustomFilterFingerprint ()Lapp/revanced/patcher/Fingerprint;
 }
 
 public final class com/HZ/CustomFilters/FingerprintsKt {

patches/api/patches.api

@@ -6,18 +6,19 @@ import com.android.tools.smali.dexlib2.Opcode
 
 val figureFiltersInitFingerprint = fingerprint {
     accessFlags(AccessFlags.PUBLIC)
-    returns("V") // constructor/initializer methods are void
-    parameters()
-    // The method we’re after has many `INVOKE_DIRECT` and `INVOKE_VIRTUAL`
-    // calls for LabelInputIncrementField and LabelColorInputIncrementField
+    returns("V")
+    parameters("Lcom/badlogic/gdx/graphics/g2d/TextureAtlas;", "Lcom/badlogic/gdx/graphics/g2d/TextureAtlas;", "Lcom/badlogic/gdx/scenes/scene2d/utils/Drawable")
     opcodes(
         Opcode.NEW_INSTANCE,
         Opcode.INVOKE_DIRECT,
         Opcode.IPUT_OBJECT,
-        Opcode.INVOKE_VIRTUAL
+        Opcode.INVOKE_VIRTUAL,
+        Opcode.IF_LT
     )
     custom { method, classDef ->
         classDef.type == "Lorg/fortheloss/sticknodes/animationscreen/modules/tooltables/FigureFiltersToolTable;" &&
-                method.name == "<init>" // constructor is where UI widgets are built
+                method.name == "initialize"
     }
 }
+
+

patches/src/main/kotlin/sticknodes/Fingerprints.kt

@@ -3,27 +3,14 @@ package com.HZ.CustomFilters
 import app.revanced.patcher.fingerprint
 import app.revanced.patcher.patch.bytecodePatch
 import app.revanced.patcher.extensions.InstructionExtensions.addInstruction
-import app.revanced.patcher.util.proxy.mutableTypes.MutableMethod
-import app.revanced.patcher.util.proxy.mutableTypes.MutableMethod.Companion.toMutable
-import com.HZ.CustomFilters.figureFiltersInitFingerprint
+import app.revanced.patcher.extensions.InstructionExtensions.addInstructions
 
-// Fingerprint: tweak class/method checks to match the real target in your APK
-val customFilterFingerprint = fingerprint {
-    // match a void method (likely constructor or init method that creates the UI)
-    returns("V")
-    parameters() // no params — change if real target has params
 
-    // Narrow by class + method name. Replace with the real class and method from JADX.
-    custom { method, classDef ->
-        classDef.type == "Lorg/fortheloss/sticknodes/animationscreen/modules/tooltables/FigureFiltersToolTable;"
-                && (method.name == "<init>" || method.name == "initFilters" || method.name == "createUI")
-    }
-}
 
 @Suppress("unused")
 val AddCustomFilterSlot = bytecodePatch(
     name = "Custom Filter slot",
-    description = "Adds a placeholder injection so patch project compiles; replace nop with real smali later."
+    description = "Adds a placeholder slot for now"
 ) {
     compatibleWith(
         "org.fortheloss.sticknodes"("4.2.5"),
@@ -32,94 +19,18 @@ val AddCustomFilterSlot = bytecodePatch(
     )
 
     // If you have an extension file, keep this; otherwise remove
-    // extendWith("extensions/extension.rve")
+    extendWith("extensions/extension.rve")
 
     // inside your bytecodePatch { execute { ... } } block
 
     execute {
-        val fpObj = figureFiltersInitFingerprint as Any
+        val figureFilterInit = figureFiltersInitFingerprint.patternMatch!!.endIndex;
+        figureFiltersInitFingerprint.method.addInstruction(0,
+            """
+                invoke-static {p0}, Lapp/revanced/extension/customfilters/TintFieldHook;->installTintField(Ljava/lang/Object;)V
+            """.trimIndent()
 
-        fun tryInvokeNoArg(obj: Any, names: List<String>): Any? {
-            for (n in names) {
-                try {
-                    val m = obj::class.java.getMethod(n)
-                    if (m.parameterCount == 0) return m.invoke(obj)
-                } catch (_: Throwable) {
-                }
-            }
-            return null
-        }
-
-        fun tryGetField(obj: Any, names: List<String>): Any? {
-            for (n in names) {
-                try {
-                    val f = obj::class.java.getDeclaredField(n)
-                    f.isAccessible = true
-                    return f.get(obj)
-                } catch (_: Throwable) {
-                }
-            }
-            return null
-        }
-
-        val match =
-            tryInvokeNoArg(fpObj, listOf("invoke", "match", "getMatch", "get"))
-                ?: tryGetField(fpObj, listOf("result", "match", "_result"))
-                ?: tryInvokeNoArg(fpObj, listOf("get"))
-
-        if (match == null) return@execute
-
-        val methodObj = tryInvokeNoArg(
-            match,
-            listOf("getMutableMethod", "toMutableMethod", "toMutable", "mutableMethod", "getMethod", "method")
-        ) ?: tryGetField(match, listOf("mutableMethod", "method"))
-
-        if (methodObj == null) return@execute
-
-        // --- SMALI instructions to add ---
-        val smaliInstructions = listOf(
-            // --- mGlowColorField ---
-            "new-instance v0, Lorg/fortheloss/framework/LabelColorInputIncrementField;",
-            "invoke-virtual {p0}, Lcom/HZ/CustomFilters/FigureFiltersToolTable;->getModule()Lorg/fortheloss/framework/Module;",
-            "move-result-object v1",
-            "invoke-virtual {v1}, Lorg/fortheloss/framework/Module;->getContext()Landroid/content/Context;",
-            "move-result-object v2",
-            "const-string v3, \"glow\"",
-            "const-string v4, \"0.00\"",
-            "const/4 v5, 0x4",
-            "const/high16 v6, 0x0",
-            "const/high16 v7, 0x40000000", // float 2.0f
-            "const/4 v8, 0x1", // boolean true
-            "invoke-direct {v0, v2, v3, v4, v5, v6, v7, v8}, Lorg/fortheloss/framework/LabelColorInputIncrementField;-><init>(Landroid/content/Context;Ljava/lang/String;Ljava/lang/String;IFFZ)V",
-            "iput-object v0, p0, Lcom/HZ/CustomFilters/FigureFiltersToolTable;->mGlowColorField:Lorg/fortheloss/framework/LabelColorInputIncrementField;",
-            "const/16 v9, 113",
-            "invoke-virtual {p0, v0, v9}, Lcom/HZ/CustomFilters/FigureFiltersToolTable;->registerWidget(Lorg/fortheloss/framework/LabelColorInputIncrementField;I)V",
-            "invoke-virtual {v0, 0x1}, Lorg/fortheloss/framework/LabelColorInputIncrementField;->setHighFidelity(Z)V",
-
-            // --- mGlowIntensityField ---
-            "new-instance v10, Lorg/fortheloss/framework/LabelColorInputIncrementField;",
-            "invoke-virtual {p0}, Lcom/HZ/CustomFilters/FigureFiltersToolTable;->getModule()Lorg/fortheloss/framework/Module;",
-            "move-result-object v11",
-            "invoke-virtual {v11}, Lorg/fortheloss/framework/Module;->getContext()Landroid/content/Context;",
-            "move-result-object v12",
-            "const-string v13, \"intensity\"",
-            "const-string v14, \"0\"",
-            "const/4 v15, 0x4",
-            "const/high16 v16, 0x0",
-            "const/high16 v17, 0x40000000", //float 2.0f
-            "const/4 v18, 0x1", //boolean true
-            "invoke-direct {v10, v12, v13, v14, v15, v16, v17, v18}, Lorg/fortheloss/framework/LabelColorInputIncrementField;-><init>(Landroid/content/Context;Ljava/lang/String;Ljava/lang/String;IFFZ)V",
-            "iput-object v10, p0, Lcom/HZ/CustomFilters/FigureFiltersToolTable;->mGlowIntensityField:Lorg/fortheloss/framework/LabelColorInputIncrementField;",
-            "const/16 v19, 114",
-            "invoke-virtual {p0, v10, v19}, Lcom/HZ/CustomFilters/FigureFiltersToolTable;->registerWidget(Lorg/fortheloss/framework/LabelColorInputIncrementField;I)V",
-            "invoke-virtual {v10, 0x1}, Lorg/fortheloss/framework/LabelColorInputIncrementField;->setHighFidelity(Z)V"
         )
-
-        val mutableMethod = methodObj as? MutableMethod ?: return@execute
-
-        for (instr in smaliInstructions) {
-            mutableMethod.addInstruction(instr)  // now uses the correct overload
         }
 
-    }
-}
+    }