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

fix a few issues (there are more remaining)
All checks were successful
Publish to snapshot maven / build (push) Successful in 13s
Details

Browse source
This commit is contained in:
moehreag 2024-05-19 01:57:31 +02:00
parent 7005d47d1e
commit 8ce3afa7d6
2 changed files with 5 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -59,8 +59,8 @@ public class NonsenseRemapper {
tasks.add(() -> { tasks.add(() -> {
try { try {
if (path.getFileName().toString().endsWith(".class")) { if (path.getFileName().toString().endsWith(".class")) {
String className = path.getFileName().toString().substring(0, path.getFileName().toString().lastIndexOf(".")); String className = path.toString().substring(1, path.toString().lastIndexOf("."));
Path result = outFs.getPath(path.toString()).resolveSibling(mapper.map(className) + ".class"); Path result = outFs.getPath(mapper.map(className) + ".class");
Path newClass = result.toAbsolutePath(); Path newClass = result.toAbsolutePath();
byte[] bytes = Files.readAllBytes(path); byte[] bytes = Files.readAllBytes(path);
ClassReader reader = new ClassReader(bytes); ClassReader reader = new ClassReader(bytes);

4
src/main/java/org/ecorous/esnesnon/nonsense_remapper/api/ParameterMethodRemapper.java
View file

@ -93,11 +93,13 @@ public class ParameterMethodRemapper extends MethodRemapper {
cleaned = cleaned.substring(cleaned.lastIndexOf('/') + 1); cleaned = cleaned.substring(cleaned.lastIndexOf('/') + 1);
} }
cleaned = cleaned.replaceAll("\\$\\d+;", "");
if (cleaned.indexOf('$') != -1) { if (cleaned.indexOf('$') != -1) {
cleaned = cleaned.substring(cleaned.lastIndexOf('$') + 1); cleaned = cleaned.substring(cleaned.lastIndexOf('$') + 1);
} }
cleaned = cleaned.replaceAll("\\[]", "").replaceAll("(.*)\\d.*", "$1").replace(";", ""); cleaned = cleaned.replaceAll("\\[]", "").replaceAll("(.*)\\d", "$1").replace(";", "");
return cleaned; return cleaned;
} }