-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Showing
8 changed files
with
100 additions
and
198 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
81 changes: 81 additions & 0 deletions
81
src/main/java/com/mmodding/gradle/impl/CustomFMJGenerationTask.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,81 @@ | ||
| package com.mmodding.gradle.impl; | ||
|
|
||
| import com.mmodding.gradle.api.mod.json.ModJson; | ||
| import org.gradle.api.DefaultTask; | ||
| import org.gradle.api.file.DirectoryProperty; | ||
| import org.gradle.api.file.RegularFile; | ||
| import org.gradle.api.provider.Provider; | ||
| import org.gradle.api.tasks.OutputDirectory; | ||
| import org.gradle.api.tasks.TaskAction; | ||
| import org.jetbrains.annotations.NotNull; | ||
|
|
||
| import java.io.File; | ||
| import java.io.IOException; | ||
| import java.nio.file.FileSystems; | ||
| import java.util.HashMap; | ||
| import java.util.HashSet; | ||
| import java.util.Map; | ||
| import java.util.Set; | ||
|
|
||
| /** | ||
| * Represents an advanced Task that injects custom mod json before Loom's {@code remapJar} task. | ||
| * <p> | ||
| * This Task only targets JARs that are not originally mods. | ||
| * </p> | ||
| * @author FirstMegaGame4, LambdAurora for the original concept | ||
| */ | ||
| public abstract class CustomFMJGenerationTask extends DefaultTask { | ||
|
|
||
| private final Map<Metadata, Set<ModJson<?, ?, ?>>> toProcess = new HashMap<>(); | ||
|
|
||
| @OutputDirectory | ||
| public abstract DirectoryProperty getOutputDirectory(); | ||
|
|
||
| public void addModJson(@NotNull Metadata metadata, @NotNull ModJson<?, ?, ?> modJson) { | ||
| Set<ModJson<?, ?, ?>> set = this.toProcess.computeIfAbsent(metadata, md -> new HashSet<>()); | ||
|
|
||
| for (var oModJson : set) { | ||
| if (oModJson.getClass().equals(modJson.getClass())) { | ||
| throw new IllegalArgumentException("Cannot add multiple mod json of the same type to the same dependency."); | ||
| } | ||
| } | ||
|
|
||
| // Add some mod json data that is always relevant for non-mod libraries. | ||
| modJson.withCustom(block -> | ||
| block.withBlock("modmenu", modMenu -> { | ||
| modMenu.withArray("badges", badges -> | ||
| badges.addUnique("library")); | ||
| modMenu.put("update_checker", false); | ||
| }) | ||
| ); | ||
|
|
||
| set.add(modJson); | ||
| } | ||
|
|
||
| @TaskAction | ||
| void insertCustomFMJs() { | ||
| for (Map.Entry<Metadata, Set<ModJson<?, ?, ?>>> entry : this.toProcess.entrySet()) { | ||
| Metadata metadata = entry.getKey(); | ||
| Provider<RegularFile> provider = this.getOutputDirectory().file(metadata.artifact() + "-" + metadata.version() + ".jar"); | ||
| if (provider.isPresent()) { | ||
| File file = provider.get().getAsFile(); | ||
| if (file.exists()) { | ||
| this.getProject().getLogger().lifecycle("Found dependency {} to process!", metadata); | ||
| try (var zipFs = FileSystems.newFileSystem(file.toPath())) { | ||
| for (var modJson : entry.getValue()) { | ||
| var modJsonPath = zipFs.getPath(modJson.getFileName()); | ||
| modJson.writeJson(modJsonPath); | ||
| } | ||
| } catch (IOException e) { | ||
| throw new RuntimeException(e); | ||
| } | ||
| } | ||
| else { | ||
| throw new RuntimeException("Did not find dependency " + metadata + "!"); | ||
| } | ||
| } | ||
| } | ||
| } | ||
|
|
||
| public record Metadata(String group, String artifact, String version) {} | ||
| } |
182 changes: 0 additions & 182 deletions
182
src/main/java/com/mmodding/gradle/impl/NestedJarsProcessor.java
This file was deleted.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters