Skip to content

Allow disabling LVT patch in MakeSourceJarsTask for Sparrow and Raven #2

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
SpaceWalkerRS merged 1 commit into from
Feb 16, 2026
Merged

Allow disabling LVT patch in MakeSourceJarsTask for Sparrow and Raven #2

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
25 changes: 18 additions & 7 deletions src/main/java/net/ornithemc/keratin/api/task/setup/MakeSourceJarsTask.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@

import org.gradle.api.provider.ListProperty;
import org.gradle.api.provider.Property;
import org.gradle.api.tasks.Internal;
import org.gradle.workers.WorkAction;
import org.gradle.workers.WorkParameters;
import org.gradle.workers.WorkQueue;
Expand All @@ -29,6 +30,8 @@
import net.ornithemc.keratin.files.KeratinFiles;

public abstract class MakeSourceJarsTask extends MinecraftTask {
@Internal
public abstract Property<Boolean> getDisableLvtPatch();

@Override
public void run(WorkQueue workQueue, MinecraftVersion minecraftVersion) throws Exception {
Expand All @@ -41,6 +44,7 @@ public void run(WorkQueue workQueue, MinecraftVersion minecraftVersion) throws E
LibrariesCache libraries = globalCache.getLibrariesCache();
SetupFiles setupFiles = files.getExceptionsAndSignaturesDevelopmentFiles().getSetupFiles();
SourceJars sourceJars = files.getExceptionsAndSignaturesDevelopmentFiles().getSourceJars();
boolean disableLvtPatch = getDisableLvtPatch().getOrElse(false);

BuildNumbers nestsBuilds = keratin.getNestsBuilds(minecraftVersion);

Expand All @@ -52,6 +56,7 @@ public void run(WorkQueue workQueue, MinecraftVersion minecraftVersion) throws E
parameters.getExceptions().set(setupFiles.getMergedExceptionsFile(minecraftVersion));
parameters.getSignatures().set(setupFiles.getMergedSignaturesFile(minecraftVersion));
parameters.getNests().set(nests.getMergedNestsFile(minecraftVersion, nestsBuilds));
parameters.getDisableLvtPatch().set(disableLvtPatch);
});
} else {
if (minecraftVersion.hasClient()) {
Expand All @@ -62,6 +67,7 @@ public void run(WorkQueue workQueue, MinecraftVersion minecraftVersion) throws E
parameters.getExceptions().set(setupFiles.getClientExceptionsFile(minecraftVersion));
parameters.getSignatures().set(setupFiles.getClientSignaturesFile(minecraftVersion));
parameters.getNests().set(nests.getClientNestsFile(minecraftVersion, nestsBuilds));
parameters.getDisableLvtPatch().set(disableLvtPatch);
});
}
if (minecraftVersion.hasServer()) {
Expand All @@ -72,6 +78,7 @@ public void run(WorkQueue workQueue, MinecraftVersion minecraftVersion) throws E
parameters.getExceptions().set(setupFiles.getServerExceptionsFile(minecraftVersion));
parameters.getSignatures().set(setupFiles.getServerSignaturesFile(minecraftVersion));
parameters.getNests().set(nests.getServerNestsFile(minecraftVersion, nestsBuilds));
parameters.getDisableLvtPatch().set(disableLvtPatch);
});
}
}
Expand All @@ -91,6 +98,7 @@ public interface SourceJarParameters extends WorkParameters {

Property<File> getNests();

Property<Boolean> getDisableLvtPatch();
}

public static abstract class MakeSourceJar implements WorkAction<SourceJarParameters>, Condor, Exceptor, SignaturePatcher, Nester {
Expand All @@ -103,6 +111,7 @@ public void execute() {
File exceptions = getParameters().getExceptions().get();
File signatures = getParameters().getSignatures().get();
File nests = getParameters().getNests().getOrNull();
boolean disableLvtPatch = getParameters().getDisableLvtPatch().get();

File tmp1 = new File(output.getParentFile(), ".tmp1." + output.getName());
File tmp2 = new File(output.getParentFile(), ".tmp2." + output.getName());
Expand All @@ -111,14 +120,16 @@ public void execute() {
File jarIn = input;
File jarOut = tmp1;

lvtPatchJar(
jarIn,
jarOut,
libraries,
true
);
if (!disableLvtPatch) {
lvtPatchJar(
jarIn,
jarOut,
libraries,
true
);

jarIn = jarOut;
jarIn = jarOut;
}
jarOut = tmp2;

exceptionsPatchJar(
Expand Down