frogmc/thyroxine
6
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

only publish on pushes to the main branch + clean up a bit
All checks were successful
Publish to snapshot maven / build (push) Successful in 14s
Details

Browse source
This commit is contained in:
moehreag 2024-05-19 17:53:43 +02:00
parent 9728a83d3e
commit a0a5f6cf2f
3 changed files with 39 additions and 29 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
.forgejo/workflows/publish.yml
View file

@ -1,6 +1,9 @@
name: Publish to snapshot maven
on: push
on:
push:
branches:
- 'main'
jobs:
build:

61
src/main/java/org/ecorous/esnesnon/nonsense_remapper/NonsenseRemapper.java
View file

@ -1,6 +1,5 @@
package org.ecorous.esnesnon.nonsense_remapper;
import java.io.IOError;
import java.io.IOException;
import java.nio.file.*;
import java.nio.file.attribute.BasicFileAttributes;
@ -13,7 +12,6 @@ import java.util.concurrent.Executors;
import org.ecorous.esnesnon.nonsense_remapper.api.Mapper;
import org.ecorous.esnesnon.nonsense_remapper.api.ParameterClassRemapper;
import org.ecorous.esnesnon.nonsense_remapper.api.data.MappingData;
import org.ecorous.esnesnon.nonsense_remapper.api.data.Member;
import org.ecorous.esnesnon.nonsense_remapper.api.data.Parchment;
import org.ecorous.esnesnon.nonsense_remapper.parser.ProguardParser;
import org.ecorous.esnesnon.nonsense_remapper.provider.MojmapProvider;
@ -27,7 +25,8 @@ import org.objectweb.asm.commons.ClassRemapper;
public class NonsenseRemapper {
public static void run(String minecraftVersion, Path inputJar, Path outputJar, boolean skipMetaInf, boolean renameParameters) throws IOException, InterruptedException {
MappingData data = ProguardParser.read(MojmapProvider.get(minecraftVersion, outputJar.resolveSibling("client-" + minecraftVersion + ".txt")).orElseThrow()).reverse();
MappingData data = ProguardParser.read(MojmapProvider.get(minecraftVersion,
outputJar.resolveSibling("client-" + minecraftVersion + ".txt")).orElseThrow()).reverse();
Parchment paramMappings = null;
if (renameParameters) {
@ -50,35 +49,20 @@ public class NonsenseRemapper {
List<Callable<Void>> tasks = new ArrayList<>();
Map<String, List<String>> lazyParents = new ConcurrentHashMap<>();
Mapper mapper = new Mapper(data, className -> lazyParents.computeIfAbsent(className, ignored -> {
try {
Path path = inFs.getPath("/" + className + ".class");
if (!Files.isRegularFile(path))
return List.of();
byte[] bytes = Files.readAllBytes(path);
ClassReader reader = new ClassReader(bytes);
List<String> superTypes = new ArrayList<>();
reader.accept(new ClassVisitor(Opcodes.ASM9) {
@Override
public void visit(int version, int access, String name, String signature, String superName, String[] interfaces) {
superTypes.add(superName);
superTypes.addAll(Arrays.asList(interfaces));
}
}, ClassReader.SKIP_CODE | ClassReader.SKIP_DEBUG | ClassReader.SKIP_FRAMES);
return superTypes;
} catch (IOException error) {
throw new Error(error); // not our problem :^) for now
}
}));
Mapper mapper = new Mapper(data, className -> lazyParents.computeIfAbsent(className, ignored ->
NonsenseRemapper.computeInheritances(className, inFs)));
Files.walkFileTree(inFs.getPath("/"), new SimpleFileVisitor<>() {
@Override
public FileVisitResult visitFile(Path path, BasicFileAttributes basicFileAttributes) {
if (skipMetaInf && path.startsWith("/META-INF"))
public FileVisitResult preVisitDirectory(Path dir, BasicFileAttributes attrs) {
if (skipMetaInf && dir.startsWith("/META-INF")) {
return FileVisitResult.SKIP_SUBTREE;
}
return FileVisitResult.CONTINUE;
}
@Override
public FileVisitResult visitFile(Path path, BasicFileAttributes basicFileAttributes) {
tasks.add(() -> {
try {
if (path.getFileName().toString().endsWith(".class")) {
@ -149,4 +133,27 @@ public class NonsenseRemapper {
}
return false;
}
private static List<String> computeInheritances(String className, FileSystem inFs){
try {
Path path = inFs.getPath("/" + className + ".class");
if (!Files.isRegularFile(path))
return List.of();
byte[] bytes = Files.readAllBytes(path);
ClassReader reader = new ClassReader(bytes);
List<String> superTypes = new ArrayList<>();
reader.accept(new ClassVisitor(Opcodes.ASM9) {
@Override
public void visit(int version, int access, String name, String signature, String superName, String[] interfaces) {
superTypes.add(superName);
superTypes.addAll(Arrays.asList(interfaces));
}
}, ClassReader.SKIP_CODE | ClassReader.SKIP_DEBUG | ClassReader.SKIP_FRAMES);
return superTypes;
} catch (IOException error) {
throw new Error(error); // not our problem :^) for now
}
}
}

2
src/main/java/org/ecorous/esnesnon/nonsense_remapper/provider/ParchmentProvider.java
View file

@ -83,7 +83,7 @@ public class ParchmentProvider {
parchment = new Gson().fromJson(mappings, Parchment.class);
}
System.out.printf("Finished loading in (%.2fs)\n", (System.currentTimeMillis() - time) / 1000F);
System.out.printf("Finished loading (%.2fs)\n", (System.currentTimeMillis() - time) / 1000F);
return parchment;
}