Skip to content

Commit

Permalink
improve
Browse files Browse the repository at this point in the history
  • Loading branch information
@CoolMineman
CoolMineman committed Oct 3, 2021
1 parent 9c321f3 commit 21508dd
Show file tree
Hide file tree
Showing 3 changed files with 97 additions and 59 deletions.
12 changes: 11 additions & 1 deletion README.md
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,16 @@
# brachyura

WIP Minecraft Modding Build Tool
\[WIP\] Java build tool focused on Minecraft modding. Uses simple buildscripts written in Java with easy to understand and debug logic.

## Goals

Predictable
Simple
Flexible

## Discord

[![Join The Discord](https://discordapp.com/api/guilds/844335788384452619/widget.png?style=banner2)](https://discord.gg/ZfNH3BUVth)

## File Structure

Expand Down
122 changes: 81 additions & 41 deletions brachyura/src/main/java/io/github/coolcrabs/brachyura/fabric/FabricProject.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,9 @@
import java.time.Instant;
import java.util.ArrayList;
import java.util.Collections;
import java.util.EnumSet;
import java.util.List;
import java.util.Set;
import java.util.function.Consumer;
import java.util.zip.ZipEntry;
import java.util.zip.ZipFile;
Expand Down Expand Up @@ -80,13 +82,41 @@

public abstract class FabricProject extends BaseJavaProject {
public abstract String getMcVersion();
// TODO switch to lazy
public abstract MappingTree getMappings();
public final Lazy<MappingTree> mappings = new Lazy<>(this::createMappings);
public abstract MappingTree createMappings();
public abstract FabricLoader getLoader();
public abstract String getModId();
public abstract String getVersion();
//TODO better api
public abstract List<JavaJarDependency> createModDependencies();
public abstract void getModDependencies(ModDependencyCollector d);

public static class ModDependencyCollector {
public final List<ModDependency> dependencies = new ArrayList<>();

public void addMaven(String repo, MavenId id, ModDependencyFlag... flags) {
add(Maven.getMavenJarDep(repo, id), flags);
}

public void add(JavaJarDependency jarDependency, ModDependencyFlag... flags) {
if (flags.length == 0) throw new UnsupportedOperationException("Must have atleast one dependency flag");
EnumSet<ModDependencyFlag> flags2 = EnumSet.of(flags[0], flags); // Bruh
dependencies.add(new ModDependency(jarDependency, flags2));
}
}

public static class ModDependency {
public final JavaJarDependency jarDependency;
public final Set<ModDependencyFlag> flags;

public ModDependency(JavaJarDependency jarDependency, Set<ModDependencyFlag> flags) {
this.jarDependency = jarDependency;
this.flags = flags;
}
}

public enum ModDependencyFlag {
COMPILE,
RUNTIME
}

public final VersionMeta versionMeta = Minecraft.getVersion(getMcVersion());

Expand All @@ -101,7 +131,6 @@ public IdeProject getIdeProject() {
Path mappingsClasspath = writeMappings4FabricStuff().getParent().getParent();
Path cwd = getProjectDir().resolve("run");
PathUtil.createDirectories(cwd);
//TODO impl compile only and runtime only deps
List<JavaJarDependency> ideDependencies = getIdeDependencies();
ArrayList<Path> classpath = new ArrayList<>(ideDependencies.size() + 1);
for (JavaJarDependency dependency : ideDependencies) {
Expand Down Expand Up @@ -185,7 +214,7 @@ public Path writeLog4jXml() {

public Path writeMappings4FabricStuff() {
try {
MappingTree mappingTree = getMappings();
MappingTree mappingTree = mappings.get();
String hash = MappingHasher.hashSha256(mappingTree);
Path result = getLocalBrachyuraPath().resolve("mappings-cache").resolve(hash).resolve("mappings").resolve("mappings.tiny"); // floader hardcoded path as it asumes you are using a yarn jar as mapping root of truth
if (!Files.isRegularFile(result)) {
Expand Down Expand Up @@ -240,7 +269,7 @@ public boolean build() {
Files.deleteIfExists(target);
try (AtomicFile atomicFile = new AtomicFile(target)) {
Files.deleteIfExists(atomicFile.tempPath);
TinyRemapper remapper = TinyRemapper.newRemapper().withMappings(new MappingTreeMappingProvider(getMappings(), Namespaces.NAMED, Namespaces.INTERMEDIARY)).build();
TinyRemapper remapper = TinyRemapper.newRemapper().withMappings(new MappingTreeMappingProvider(mappings.get(), Namespaces.NAMED, Namespaces.INTERMEDIARY)).build();
try {
for (Path path : getCompileDependencies()) {
TinyRemapperHelper.readJar(remapper, path, JarType.CLASSPATH);
Expand Down Expand Up @@ -332,8 +361,8 @@ public List<Path> getCompileDependencies() {
}
result.add(namedJar.get().jar);
result.add(Maven.getMavenJarDep(FabricMaven.URL, FabricMaven.mixinCompileExtensions("0.4.4")).jar);
for (JavaJarDependency dep : remappedModDependencied.get()) {
result.add(dep.jar);
for (ModDependency dep : remappedModDependencies.get()) {
if (dep.flags.contains(ModDependencyFlag.COMPILE)) result.add(dep.jarDependency.jar);
}
return result;
}
Expand All @@ -348,7 +377,9 @@ public List<JavaJarDependency> getIdeDependencies() {
result.add(Maven.getMavenJarDep(FabricMaven.URL, FabricMaven.devLaunchInjector("0.2.1+build.8")));
result.add(Maven.getMavenJarDep(Maven.MAVEN_CENTRAL, new MavenId("net.minecrell", "terminalconsoleappender", "1.2.0")));
result.add(getDecompiledJar());
result.addAll(remappedModDependencied.get());
for (ModDependency d : remappedModDependencies.get()) {
if (d.flags.contains(ModDependencyFlag.RUNTIME)) result.add(d.jarDependency);
}
return result;
}

Expand All @@ -363,18 +394,20 @@ public List<Dependency> createDependencies() {
return result;
}

public final Lazy<List<JavaJarDependency>> remappedModDependencied = new Lazy<>(this::createRemappedModDependencies);
public final Lazy<List<ModDependency>> remappedModDependencies = new Lazy<>(this::createRemappedModDependencies);
/**
* 🍝
*/
public List<JavaJarDependency> createRemappedModDependencies() {
public List<ModDependency> createRemappedModDependencies() {
try {
List<JavaJarDependency> unmapped = createModDependencies();
ModDependencyCollector d = new ModDependencyCollector();
getModDependencies(d);
List<ModDependency> unmapped = d.dependencies;
if (unmapped == null) return Collections.emptyList();
List<JavaJarDependency> result = new ArrayList<>(unmapped.size());
List<ModDependency> result = new ArrayList<>(unmapped.size());
MessageDigest dephasher = MessageDigestUtil.messageDigest(MessageDigestUtil.SHA256);
dephasher.update((byte) 2); // Bump this if the logic changes
for (JavaJarDependency dep : unmapped) {
dephasher.update((byte) 3); // Bump this if the logic changes
for (ModDependency dep : unmapped) {
hashDep(dephasher, dep);
}
for (JavaJarDependency dep : mcClasspath.get()) {
Expand All @@ -385,36 +418,35 @@ public List<JavaJarDependency> createRemappedModDependencies() {
String dephash = MessageDigestUtil.toHexHash(dephasher.digest());
Path depdir = getLocalBrachyuraPath().resolve("deps");
Path resultdir = depdir.resolve(dephash);
MappingTree mappings = getMappings();
if (!Files.isDirectory(resultdir)) {
if (Files.isDirectory(depdir)) {
PathUtil.deleteDirectoryChildren(depdir);
}
try (AtomicDirectory a = new AtomicDirectory(resultdir)) {
TinyRemapper tr = TinyRemapper.newRemapper()
.withMappings(new MappingTreeMappingProvider(mappings, Namespaces.INTERMEDIARY, Namespaces.NAMED))
.withMappings(new MappingTreeMappingProvider(mappings.get(), Namespaces.INTERMEDIARY, Namespaces.NAMED))
.renameInvalidLocals(false)
.build();
TinyRemapperHelper.readJar(tr, intermediaryjar.get().jar, JarType.CLASSPATH);
for (JavaJarDependency dep : mcClasspath.get()) {
TinyRemapperHelper.readJar(tr, dep.jar, JarType.CLASSPATH);
}
class RemapInfo {
JavaJarDependency dep;
ModDependency dep;
FileSystem fs;
FileSystem outFs;
Path outPath;
InputTag tag;
}
List<RemapInfo> b = new ArrayList<>();
try {
for (JavaJarDependency u : unmapped) {
for (ModDependency u : unmapped) {
RemapInfo ri = new RemapInfo();
b.add(ri);
ri.dep = u;
ri.tag = tr.createInputTag();
ri.outPath = a.tempPath.resolve(u.jar.getFileName().toString());
ri.fs = FileSystemUtil.newJarFileSystem(u.jar);
ri.outPath = a.tempPath.resolve(u.jarDependency.jar.getFileName().toString());
ri.fs = FileSystemUtil.newJarFileSystem(u.jarDependency.jar);
ri.outFs = FileSystemUtil.newJarFileSystem(ri.outPath);
}
Logger.info("Remapping " + b.size() + " mods");
Expand All @@ -439,7 +471,7 @@ public FileVisitResult visitFile(Path file, BasicFileAttributes attrs) throws IO
int v = AccessWidenerReader.readVersion(r);
r.reset();
AccessWidenerWriter w = new AccessWidenerWriter(v);
AccessWidenerNamespaceChanger nc = new AccessWidenerNamespaceChanger(w, mappings, mappings.getNamespaceId(Namespaces.NAMED));
AccessWidenerNamespaceChanger nc = new AccessWidenerNamespaceChanger(w, mappings.get(), mappings.get().getNamespaceId(Namespaces.NAMED));
new AccessWidenerReader(nc).read(r);
Files.copy(new ByteArrayInputStream(w.write()), target);
}
Expand All @@ -458,28 +490,31 @@ public FileVisitResult visitFile(Path file, BasicFileAttributes attrs) throws IO
}
tr.finish();
}
BudgetSourceRemapper sourceRemapper = new BudgetSourceRemapper(mappings, mappings.getNamespaceId(Namespaces.INTERMEDIARY), mappings.getNamespaceId(Namespaces.NAMED));
for (JavaJarDependency u : unmapped) {
if (u.sourcesJar != null) {
Logger.info("Remapping " + u.sourcesJar.getFileName());
BudgetSourceRemapper sourceRemapper = new BudgetSourceRemapper(mappings.get(), mappings.get().getNamespaceId(Namespaces.INTERMEDIARY), mappings.get().getNamespaceId(Namespaces.NAMED));
for (ModDependency u : unmapped) {
if (u.jarDependency != null) {
Logger.info("Remapping " + u.jarDependency.sourcesJar.getFileName());
long start = System.currentTimeMillis();
Path target = a.tempPath.resolve(u.jar.getFileName().toString().replace(".jar", "-sources.jar"));
sourceRemapper.remapSourcesJar(u.sourcesJar, target);
Path target = a.tempPath.resolve(u.jarDependency.jar.getFileName().toString().replace(".jar", "-sources.jar"));
sourceRemapper.remapSourcesJar(u.jarDependency.sourcesJar, target);
long end = System.currentTimeMillis() - start;
Logger.info("Remapped " + u.sourcesJar.getFileName() + " in " + end + "ms");
Logger.info("Remapped " + u.jarDependency.sourcesJar.getFileName() + " in " + end + "ms");
}
}
a.commit();
}
}
for (JavaJarDependency unmapdep : unmapped) {
for (ModDependency unmapdep : unmapped) {
result.add(
new JavaJarDependency(
resultdir.resolve(
unmapdep.jar.getFileName().toString()
new ModDependency(
new JavaJarDependency(
resultdir.resolve(
unmapdep.jarDependency.jar.getFileName().toString()
),
unmapdep.jarDependency.sourcesJar == null ? null : resultdir.resolve(unmapdep.jarDependency.jar.getFileName().toString().replace(".jar", "-sources.jar")),
unmapdep.jarDependency.mavenId
),
unmapdep.sourcesJar == null ? null : resultdir.resolve(unmapdep.jar.getFileName().toString().replace(".jar", "-sources.jar")),
unmapdep.mavenId
unmapdep.flags
)
);
}
Expand All @@ -489,6 +524,13 @@ public FileVisitResult visitFile(Path file, BasicFileAttributes attrs) throws IO
}
}

public void hashDep(MessageDigest md, ModDependency dep) {
hashDep(md, dep.jarDependency);
for (ModDependencyFlag flag : dep.flags) {
MessageDigestUtil.update(md, flag.ordinal());
}
}

public void hashDep(MessageDigest md, JavaJarDependency dep) {
if (dep.mavenId == null) {
// Hash the id if it exists
Expand Down Expand Up @@ -572,13 +614,12 @@ public RemappedJar createIntermediaryJar() {
public final Lazy<RemappedJar> namedJar = new Lazy<>(this::createNamedJar);
public RemappedJar createNamedJar() {
Path intermediaryJar2 = intermediaryjar.get().jar;
MappingTree mappings = getMappings();
Intermediary intermediary = getIntermediary();
String mappingHash = MappingHasher.hashSha256(intermediary.tree, mappings);
String mappingHash = MappingHasher.hashSha256(intermediary.tree, mappings.get());
Path result = fabricCache().resolve("named").resolve(getMcVersion() + "-named-" + mappingHash + ".jar");
if (!Files.isRegularFile(result)) {
try (AtomicFile atomicFile = new AtomicFile(result)) {
remapJar(mappings, Namespaces.INTERMEDIARY, Namespaces.NAMED, intermediaryJar2, atomicFile.tempPath, mcClasspathPaths.get());
remapJar(mappings.get(), Namespaces.INTERMEDIARY, Namespaces.NAMED, intermediaryJar2, atomicFile.tempPath, mcClasspathPaths.get());
atomicFile.commit();
}
}
Expand All @@ -589,7 +630,6 @@ public JavaJarDependency getDecompiledJar() {
RemappedJar named = namedJar.get();
BrachyuraDecompiler decompiler = decompiler();
if (decompiler == null) return new JavaJarDependency(named.jar, null, null);
MappingTree mappings = getMappings();
Path result = fabricCache().resolve("decompiled").resolve(getMcVersion() + "-named-" + named.mappingHash + "-decomp-" + decompiler.getName() + "-" + decompiler.getVersion() + "-sources.jar");
Path result2 = fabricCache().resolve("decompiled").resolve(getMcVersion() + "-named-" + named.mappingHash + "-decomp-" + decompiler.getName() + "-" + decompiler.getVersion() + ".linemappings");
if (!(Files.isRegularFile(result) && Files.isRegularFile(result2))) {
Expand All @@ -599,7 +639,7 @@ public JavaJarDependency getDecompiledJar() {
) {
Logger.info("Decompiling " + named.jar.getFileName() + " using " + decompiler.getName() + " " + decompiler.getVersion() + " with " + decompiler.getThreadCount() + " threads");
long start = System.currentTimeMillis();
decompiler.decompile(named.jar, decompClasspath(), atomicFile.tempPath, atomicFile2.tempPath, mappings, mappings.getNamespaceId(Namespaces.NAMED));
decompiler.decompile(named.jar, decompClasspath(), atomicFile.tempPath, atomicFile2.tempPath, mappings.get(), mappings.get().getNamespaceId(Namespaces.NAMED));
long end = System.currentTimeMillis();
Logger.info("Decompiled " + named.jar.getFileName() + " in " + (end - start) + "ms");
atomicFile.commit();
Expand Down
22 changes: 5 additions & 17 deletions brachyura/src/test/java/io/github/coolcrabs/brachyura/fabric/FabricProjectTest.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,14 +4,10 @@

import java.nio.file.Files;
import java.nio.file.Path;
import java.util.Arrays;
import java.util.List;

import org.junit.jupiter.api.Test;

import io.github.coolcrabs.brachyura.decompiler.BrachyuraDecompiler;
import io.github.coolcrabs.brachyura.dependency.JavaJarDependency;
import io.github.coolcrabs.brachyura.maven.Maven;
import io.github.coolcrabs.brachyura.maven.MavenId;
import io.github.coolcrabs.brachyura.util.JvmUtil;
import io.github.coolcrabs.brachyura.util.PathUtil;
Expand All @@ -35,7 +31,7 @@ public String getMcVersion() {
}

@Override
public MappingTree getMappings() {
public MappingTree createMappings() {
MappingTree tree = Yarn.ofMaven(FabricMaven.URL, FabricMaven.yarn("21w39a+build.3")).tree;
return tree;
}
Expand All @@ -53,18 +49,10 @@ public Path getProjectDir() {
}

@Override
public List<JavaJarDependency> createModDependencies() {
return Arrays.asList(
Maven.getMavenJarDep(
FabricMaven.URL,
new MavenId(FabricMaven.GROUP_ID + ".fabric-api", "fabric-resource-loader-v0", "0.4.8+a00e834b88")
),
Maven.getMavenJarDep(
FabricMaven.URL,
new MavenId(FabricMaven.GROUP_ID + ".fabric-api", "fabric-game-rule-api-v1", "1.0.7+cbda931888")
)
);
}
public void getModDependencies(ModDependencyCollector d) {
d.addMaven(FabricMaven.URL, new MavenId(FabricMaven.GROUP_ID + ".fabric-api", "fabric-resource-loader-v0", "0.4.8+a00e834b88"), ModDependencyFlag.RUNTIME, ModDependencyFlag.COMPILE);
d.addMaven(FabricMaven.URL, new MavenId(FabricMaven.GROUP_ID + ".fabric-api", "fabric-game-rule-api-v1", "1.0.7+cbda931888"), ModDependencyFlag.RUNTIME, ModDependencyFlag.COMPILE);
};

@Override
public BrachyuraDecompiler decompiler() {
Expand Down

0 comments on commit 21508dd

Please sign in to comment.