support multiple mods

Author: SolsticeSpectrum

README.md

@@ -47,36 +47,58 @@ export IDEA_JDK="/usr/lib/jvm/java-21-jetbrains"
 ## Structure
 
 ```
-├── jars/           # vanilla jars
-├── libs/           # decompiler linking libs
-├── patches/        # decompiler fixes
-├── mods/           # your modifications (.patch and .zip)
-├── server/src/     # server source
-├── client/src/     # client source
-└── prism-instance/ # PrismLauncher instance template
+├── jars/              # vanilla jars
+├── libs/              # decompiler linking libs
+├── patches/           # decompiler fixes
+├── mods/
+│   ├── client/        # client patches (mymod.patch)
+│   └── server/        # server patches (mymod.patch)
+├── server/src/        # server source
+├── client/src/        # client source
+└── prism-instance/    # PrismLauncher instance template
 ```
 
 ## Modding
 
 Two-layer patch system:
 1. `patches/` - fixes for decompiler output (don't touch)
-2. `mods/` - your changes
+2. `mods/client/` and `mods/server/` - your named patches
 
-Edit source, test, then generate patches:
+Edit source, test, then generate a named patch:
 ```bash
-./gradlew genClientMods
-./gradlew genServerMods
+./gradlew modGen -Pargs=client,mymod
+./gradlew modGen -Pargs=server,mymod
+```
+
+This saves to `mods/client/mymod.patch` or `mods/server/mymod.patch`.
+
+### Applying Mods
+
+Apply named patches to the source:
+```bash
+./gradlew modApply -Pargs=client,mod1,mod2,mod3
+./gradlew modApply -Pargs=server,mod1,mod2,mod3
+```
+
+Patches are applied in order. If a patch fails, it likely depends on another.
+
+### Reverting Mods
+
+Reverse patches (in reverse order):
+```bash
+./gradlew modRevert -Pargs=client,mod1,mod2,mod3
+./gradlew modRevert -Pargs=server,mod1,mod2,mod3
 ```
 
 ### Packing Mods
 
 Pack changed classes into a zip for distribution:
 ```bash
-./gradlew packClient
-./gradlew packServer
+./gradlew modPack -Pargs=client,mod1,mod2,mod3
+./gradlew modPack -Pargs=server,mod1,mod2,mod3
 ```
 
-This compares your source against the base, finds modified files, and outputs them to `mods/client.zip` or `mods/server.zip`.
+This applies the patches first, then compares against the base and outputs to `mods/client.zip` or `mods/server.zip`.
 
 ### Using with PrismLauncher
 

build.gradle

@@ -111,63 +111,46 @@ task snapClient {
     }
 }
 
-task modsServer {
+task modApply {
     group = 'mods'
-    dependsOn snapServer
     doLast {
-        Patcher.apply(file('server/src/main/java'), file('mods/server.patch'))
+        def p = project.hasProperty('args') ? project.args.split(',') : null
+        if (!p || p.length < 2) throw new RuntimeException("Usage: -Pargs=side,mod1,mod2")
+        Mod.apply(rootDir, p[0], p[1..-1] as String[])
     }
 }
 
-task modsClient {
+task modRevert {
     group = 'mods'
-    dependsOn snapClient
     doLast {
-        Patcher.apply(file('client/src/main/java'), file('mods/client.patch'))
+        def p = project.hasProperty('args') ? project.args.split(',') : null
+        if (!p || p.length < 2) throw new RuntimeException("Usage: -Pargs=side,mod1,mod2")
+        Mod.revert(rootDir, p[0], p[1..-1] as String[])
     }
 }
 
-task setupServer { group = 'setup'; dependsOn modsServer }
-task setupClient { group = 'setup'; dependsOn modsClient }
-task setup { group = 'setup'; dependsOn setupServer, setupClient }
-
-task genModsServer {
-    group = 'mods'
-    doLast {
-        Patcher.diff(file('patchSrc/server-base.zip'), file('server/src/main/java'),
-            file('mods/server.patch'), true)
-    }
-}
-
-task genModsClient {
+task modGen {
     group = 'mods'
     doLast {
-        Patcher.diff(file('patchSrc/client-base.zip'), file('client/src/main/java'),
-            file('mods/client.patch'), true)
+        def p = project.hasProperty('args') ? project.args.split(',') : null
+        if (!p || p.length != 2) throw new RuntimeException("Usage: -Pargs=side,name")
+        Mod.gen(rootDir, p[0], p[1])
     }
 }
 
-task genMods { group = 'mods'; dependsOn genModsServer, genModsClient }
-
-task packServer {
+task modPack {
     group = 'mods'
-    dependsOn ':server:compileJava'
+    dependsOn ':client:compileJava', ':server:compileJava'
     doLast {
-        Mod.pack(file('patchSrc/server-base.zip'), file('server/src/main/java'),
-            file('server/build/classes/java/main'), file('mods/server.zip'))
+        def p = project.hasProperty('args') ? project.args.split(',') : null
+        if (!p || p.length < 2) throw new RuntimeException("Usage: -Pargs=side,mod1,mod2")
+        Mod.pack(rootDir, p[0], p[1..-1] as String[])
     }
 }
 
-task packClient {
-    group = 'mods'
-    dependsOn ':client:compileJava'
-    doLast {
-        Mod.pack(file('patchSrc/client-base.zip'), file('client/src/main/java'),
-            file('client/build/classes/java/main'), file('mods/client.zip'))
-    }
-}
-
-task pack { group = 'mods'; dependsOn packServer, packClient }
+task setupServer { group = 'setup'; dependsOn snapServer }
+task setupClient { group = 'setup'; dependsOn snapClient }
+task setup { group = 'setup'; dependsOn setupServer, setupClient }
 
 task genPatchServer {
     group = 'patches'

buildSrc/src/main/java/Mod.java

@@ -5,6 +5,43 @@
 
 public class Mod {
 
+    public static void apply(File root, String side, String[] names) throws Exception {
+        for (String name : names) {
+            File patch = new File(root, "mods/" + side + "/" + name + ".patch");
+
+            if (!patch.exists()) throw new RuntimeException("Patch not found: " + patch);
+            Patcher.apply(new File(root, side + "/src/main/java"), patch);
+        }
+    }
+
+    public static void revert(File root, String side, String[] names) throws Exception {
+        for (int i = names.length - 1; i >= 0; i--) {
+            File patch = new File(root, "mods/" + side + "/" + names[i] + ".patch");
+
+            if (!patch.exists()) throw new RuntimeException("Patch not found: " + patch);
+            Patcher.unapply(new File(root, side + "/src/main/java"), patch);
+        }
+    }
+
+    public static void gen(File root, String side, String name) throws Exception {
+        File base = new File(root, "patchSrc/" + side + "-base.zip");
+        File src = new File(root, side + "/src/main/java");
+        File out = new File(root, "mods/" + side + "/" + name + ".patch");
+
+        Patcher.diff(base, src, out, true);
+    }
+
+    public static void pack(File root, String side, String[] names) throws Exception {
+        apply(root, side, names);
+
+        File base = new File(root, "patchSrc/" + side + "-base.zip");
+        File src = new File(root, side + "/src/main/java");
+        File classes = new File(root, side + "/build/classes/java/main");
+        File out = new File(root, "mods/" + side + ".zip");
+
+        pack(base, src, classes, out);
+    }
+
     public static void pack(File base, File src, File classes, File out) throws Exception {
         if (!base.exists()) throw new RuntimeException("Run setup first");
 

buildSrc/src/main/java/Patcher.java

@@ -11,6 +11,12 @@ public static void apply(File dir, File patch) throws Exception {
         run(dir, "patch", "-p1", "-i", patch.getAbsolutePath());
     }
 
+    public static void unapply(File dir, File patch) throws Exception {
+        if (!patch.exists()) return;
+
+        run(dir, "patch", "-R", "-p1", "-i", patch.getAbsolutePath());
+    }
+
     public static void snap(File src, File dest) throws IOException {
         dest.getParentFile().mkdirs();