Skip to content

Commit 71f7c05

Browse files
LassebqLassebq
committed
Setup rewrite. And I got API request limited LOL
1 parent 45b0165 commit 71f7c05

18 files changed

Lines changed: 490 additions & 363 deletions

‎logs/mcp.log‎

Lines changed: 0 additions & 2 deletions
This file was deleted.

‎src/main/java/org/mcphackers/mcp/MCPLogger.java‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,7 @@
99
import java.util.List;
1010

1111
import org.fusesource.jansi.Ansi;
12-
import org.mcphackers.mcp.tools.ProgressInfo;
13-
import org.mcphackers.mcp.tools.Util;
12+
import org.mcphackers.mcp.tools.FileUtil;
1413

1514
public class MCPLogger {
1615

@@ -19,7 +18,7 @@ public class MCPLogger {
1918

2019
public MCPLogger() {
2120
try {
22-
Util.createDirectories(Paths.get("logs"));
21+
FileUtil.createDirectories(Paths.get("logs"));
2322
writer = new BufferedWriter(new FileWriter(new File("logs/mcp.log")));
2423
} catch (IOException e) {}
2524
}

src/main/java/org/mcphackers/mcp/tools/ProgressInfo.java renamed to src/main/java/org/mcphackers/mcp/ProgressInfo.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package org.mcphackers.mcp.tools;
1+
package org.mcphackers.mcp;
22

33
public class ProgressInfo {
44

‎src/main/java/org/mcphackers/mcp/SideThread.java‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
package org.mcphackers.mcp;
22

33
import org.mcphackers.mcp.tasks.Task;
4-
import org.mcphackers.mcp.tools.ProgressInfo;
54

65
public class SideThread extends Thread {
76

‎src/main/java/org/mcphackers/mcp/tasks/Task.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
package org.mcphackers.mcp.tasks;
22

3+
import org.mcphackers.mcp.ProgressInfo;
34
import org.mcphackers.mcp.tasks.info.TaskInfo;
4-
import org.mcphackers.mcp.tools.ProgressInfo;
55

66
public abstract class Task {
77

‎src/main/java/org/mcphackers/mcp/tasks/TaskBuild.java‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,9 @@
66
import java.util.List;
77

88
import org.mcphackers.mcp.MCPConfig;
9+
import org.mcphackers.mcp.ProgressInfo;
910
import org.mcphackers.mcp.tasks.info.TaskInfo;
10-
import org.mcphackers.mcp.tools.ProgressInfo;
11-
import org.mcphackers.mcp.tools.Util;
11+
import org.mcphackers.mcp.tools.FileUtil;
1212

1313
public class TaskBuild extends Task {
1414

@@ -38,22 +38,22 @@ public void doTask() throws Exception {
3838
this.reobfTask.doTask();
3939
break;
4040
case BUILD:
41-
Util.createDirectories(Paths.get(MCPConfig.BUILD));
41+
FileUtil.createDirectories(Paths.get(MCPConfig.BUILD));
4242
if(MCPConfig.fullBuild) {
4343
Files.deleteIfExists(buildJar);
4444
Files.copy(originalJar, buildJar);
45-
List<Path> reobfClasses = Util.listDirectory(reobfDir, path -> !Files.isDirectory(path));
46-
Util.packFilesToZip(buildJar, reobfClasses, reobfDir);
47-
List<Path> assets = Util.listDirectory(bin, path -> !Files.isDirectory(path) && !path.getFileName().toString().endsWith(".class"));
48-
Util.packFilesToZip(buildJar, assets, bin);
49-
Util.deleteFileInAZip(buildJar, "/META-INF/MOJANG_C.DSA");
50-
Util.deleteFileInAZip(buildJar, "/META-INF/MOJANG_C.SF");
45+
List<Path> reobfClasses = FileUtil.listDirectory(reobfDir, path -> !Files.isDirectory(path));
46+
FileUtil.packFilesToZip(buildJar, reobfClasses, reobfDir);
47+
List<Path> assets = FileUtil.listDirectory(bin, path -> !Files.isDirectory(path) && !path.getFileName().toString().endsWith(".class"));
48+
FileUtil.packFilesToZip(buildJar, assets, bin);
49+
FileUtil.deleteFileInAZip(buildJar, "/META-INF/MOJANG_C.DSA");
50+
FileUtil.deleteFileInAZip(buildJar, "/META-INF/MOJANG_C.SF");
5151
}
5252
else {
5353
Files.deleteIfExists(buildZip);
54-
Util.compress(reobfDir, buildZip);
55-
List<Path> assets = Util.listDirectory(bin, path -> !Files.isDirectory(path) && !path.getFileName().toString().endsWith(".class"));
56-
Util.packFilesToZip(buildZip, assets, bin);
54+
FileUtil.compress(reobfDir, buildZip);
55+
List<Path> assets = FileUtil.listDirectory(bin, path -> !Files.isDirectory(path) && !path.getFileName().toString().endsWith(".class"));
56+
FileUtil.packFilesToZip(buildZip, assets, bin);
5757
}
5858
break;
5959
}

‎src/main/java/org/mcphackers/mcp/tasks/TaskCleanup.java‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@
77
import org.mcphackers.mcp.MCP;
88
import org.mcphackers.mcp.MCPConfig;
99
import org.mcphackers.mcp.tasks.info.TaskInfo;
10+
import org.mcphackers.mcp.tools.FileUtil;
1011
import org.mcphackers.mcp.tools.Util;
1112

1213
public class TaskCleanup extends Task {
@@ -20,6 +21,7 @@ public void doTask() throws Exception {
2021
long startTime = System.currentTimeMillis();
2122
int foldersDeleted = 0;
2223
Path[] pathsToDelete = new Path[] {
24+
Paths.get(MCPConfig.CONF),
2325
Paths.get(MCPConfig.JARS),
2426
Paths.get(MCPConfig.LIB),
2527
Paths.get(MCPConfig.TEMP),
@@ -39,7 +41,7 @@ public void doTask() throws Exception {
3941
if (Files.exists(path)) {
4042
foldersDeleted++;
4143
MCP.logger.info(" Deleting " + path + "...");
42-
Util.deleteDirectory(path);
44+
FileUtil.deleteDirectory(path);
4345
}
4446
}
4547

‎src/main/java/org/mcphackers/mcp/tasks/TaskDecompile.java‎

Lines changed: 21 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1,22 +1,27 @@
11
package org.mcphackers.mcp.tasks;
22

3-
import codechicken.diffpatch.cli.PatchOperation;
4-
import net.fabricmc.tinyremapper.*;
3+
import java.io.IOException;
4+
import java.nio.file.Files;
5+
import java.nio.file.Path;
6+
import java.nio.file.Paths;
7+
import java.util.function.BiConsumer;
8+
import java.util.regex.Pattern;
9+
510
import org.mcphackers.mcp.MCPConfig;
11+
import org.mcphackers.mcp.ProgressInfo;
612
import org.mcphackers.mcp.tasks.info.TaskInfo;
7-
import org.mcphackers.mcp.tools.ProgressInfo;
8-
import org.mcphackers.mcp.tools.Util;
13+
import org.mcphackers.mcp.tools.FileUtil;
914
import org.mcphackers.mcp.tools.constants.GLConstants;
1015
import org.mcphackers.mcp.tools.constants.MathConstants;
1116
import org.mcphackers.mcp.tools.fernflower.Decompiler;
1217
import org.mcphackers.mcp.tools.mcinjector.MCInjector;
1318

14-
import java.io.IOException;
15-
import java.nio.file.Files;
16-
import java.nio.file.Path;
17-
import java.nio.file.Paths;
18-
import java.util.function.BiConsumer;
19-
import java.util.regex.Pattern;
19+
import codechicken.diffpatch.cli.PatchOperation;
20+
import net.fabricmc.tinyremapper.IMappingProvider;
21+
import net.fabricmc.tinyremapper.NonClassCopyMode;
22+
import net.fabricmc.tinyremapper.OutputConsumerPath;
23+
import net.fabricmc.tinyremapper.TinyRemapper;
24+
import net.fabricmc.tinyremapper.TinyUtils;
2025

2126
public class TaskDecompile extends Task {
2227

@@ -57,15 +62,15 @@ public void doTask() throws Exception {
5762
Path patchesPath = Paths.get(chooseFromSide(MCPConfig.CLIENT_PATCHES, MCPConfig.SERVER_PATCHES));
5863
Path mappings = Paths.get(chooseFromSide(MCPConfig.CLIENT_MAPPINGS, MCPConfig.SERVER_MAPPINGS));
5964

60-
boolean hasLWJGL = side == 0;
65+
boolean hasLWJGL = side == CLIENT;
6166

6267
if (Files.exists(srcPath)) {
6368
throw new IOException(chooseFromSide("Client", "Server") + " sources found! Aborting.");
6469
}
6570
for (Path path : new Path[] { Paths.get(tinyOut), Paths.get(excOut), Paths.get(srcZip)}) {
6671
Files.deleteIfExists(path);
6772
}
68-
Util.deleteDirectoryIfExists(ffOut);
73+
FileUtil.deleteDirectoryIfExists(ffOut);
6974
while(step < STEPS) {
7075
step();
7176
switch (step) {
@@ -93,8 +98,8 @@ public void doTask() throws Exception {
9398
this.decompiler.decompile(excOut, srcZip, chooseFromSide(MCPConfig.JAVADOC_CLIENT, MCPConfig.JAVADOC_SERVER));
9499
break;
95100
case EXTRACT:
96-
Util.createDirectories(Paths.get(MCPConfig.SRC));
97-
Util.unzipByExtension(Paths.get(srcZip), ffOut, ".java");
101+
FileUtil.createDirectories(Paths.get(MCPConfig.SRC));
102+
FileUtil.unzipByExtension(Paths.get(srcZip), ffOut, ".java");
98103
break;
99104
case PATCH:
100105
if(MCPConfig.patch && Files.exists(patchesPath)) {
@@ -111,13 +116,13 @@ public void doTask() throws Exception {
111116
}
112117
break;
113118
case CONSTS:
114-
new MathConstants().replace(ffOut);
115119
if(hasLWJGL) {
116120
new GLConstants().replace(ffOut);
117121
}
122+
new MathConstants().replace(ffOut);
118123
break;
119124
case COPYSRC:
120-
Util.copyDirectory(ffOut, srcPath, MCPConfig.ignorePackages);
125+
FileUtil.copyDirectory(ffOut, srcPath, MCPConfig.ignorePackages);
121126
break;
122127
case RECOMPILE:
123128
recompTask.doTask();

‎src/main/java/org/mcphackers/mcp/tasks/TaskRecompile.java‎

Lines changed: 14 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,5 @@
11
package org.mcphackers.mcp.tasks;
22

3-
import org.mcphackers.mcp.MCPConfig;
4-
import org.mcphackers.mcp.tasks.info.TaskInfo;
5-
import org.mcphackers.mcp.tools.ProgressInfo;
6-
import org.mcphackers.mcp.tools.Util;
7-
8-
import javax.tools.*;
93
import java.io.File;
104
import java.io.IOException;
115
import java.nio.file.Files;
@@ -15,6 +9,18 @@
159
import java.util.List;
1610
import java.util.stream.Collectors;
1711

12+
import javax.tools.Diagnostic;
13+
import javax.tools.DiagnosticCollector;
14+
import javax.tools.JavaCompiler;
15+
import javax.tools.JavaFileObject;
16+
import javax.tools.StandardJavaFileManager;
17+
import javax.tools.ToolProvider;
18+
19+
import org.mcphackers.mcp.MCPConfig;
20+
import org.mcphackers.mcp.ProgressInfo;
21+
import org.mcphackers.mcp.tasks.info.TaskInfo;
22+
import org.mcphackers.mcp.tools.FileUtil;
23+
1824
public class TaskRecompile extends Task {
1925
private int total;
2026
private int progress;
@@ -41,7 +47,7 @@ public void doTask() throws Exception {
4147

4248
step();
4349
this.progress = 1;
44-
Util.deleteDirectoryIfExists(binPath);
50+
FileUtil.deleteDirectoryIfExists(binPath);
4551
Files.createDirectories(binPath);
4652
this.progress = 2;
4753

@@ -65,7 +71,7 @@ public void doTask() throws Exception {
6571
this.progress = 50;
6672
// Copy assets from source folder
6773
step();
68-
List<Path> assets = Util.listDirectory(srcPath, path -> !Files.isDirectory(path) && !path.getFileName().toString().endsWith(".java"));
74+
List<Path> assets = FileUtil.listDirectory(srcPath, path -> !Files.isDirectory(path) && !path.getFileName().toString().endsWith(".java"));
6975
int i = 0;
7076
for(Path path : assets) {
7177
if(srcPath.relativize(path).getParent() != null) {

‎src/main/java/org/mcphackers/mcp/tasks/TaskReobfuscate.java‎

Lines changed: 28 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,25 +1,38 @@
11
package org.mcphackers.mcp.tasks;
22

3-
import net.fabricmc.tinyremapper.OutputConsumerPath;
4-
import net.fabricmc.tinyremapper.TinyRemapper;
5-
import net.fabricmc.tinyremapper.TinyUtils;
6-
import net.lingala.zip4j.ZipFile;
7-
import net.lingala.zip4j.model.FileHeader;
8-
9-
import org.mcphackers.mcp.MCPConfig;
10-
import org.mcphackers.mcp.tasks.info.TaskInfo;
11-
import org.mcphackers.mcp.tools.ProgressInfo;
12-
import org.mcphackers.mcp.tools.Util;
13-
import org.objectweb.asm.*;
14-
15-
import java.io.*;
16-
import java.nio.file.*;
3+
import java.io.BufferedReader;
4+
import java.io.BufferedWriter;
5+
import java.io.FileReader;
6+
import java.io.FileWriter;
7+
import java.io.IOException;
8+
import java.nio.file.FileVisitResult;
9+
import java.nio.file.Files;
10+
import java.nio.file.Path;
11+
import java.nio.file.Paths;
12+
import java.nio.file.SimpleFileVisitor;
1713
import java.nio.file.attribute.BasicFileAttributes;
1814
import java.util.HashMap;
1915
import java.util.List;
2016
import java.util.Map;
2117
import java.util.Objects;
2218

19+
import org.mcphackers.mcp.MCPConfig;
20+
import org.mcphackers.mcp.ProgressInfo;
21+
import org.mcphackers.mcp.tasks.info.TaskInfo;
22+
import org.mcphackers.mcp.tools.FileUtil;
23+
import org.mcphackers.mcp.tools.Util;
24+
import org.objectweb.asm.ClassReader;
25+
import org.objectweb.asm.ClassVisitor;
26+
import org.objectweb.asm.FieldVisitor;
27+
import org.objectweb.asm.MethodVisitor;
28+
import org.objectweb.asm.Opcodes;
29+
30+
import net.fabricmc.tinyremapper.OutputConsumerPath;
31+
import net.fabricmc.tinyremapper.TinyRemapper;
32+
import net.fabricmc.tinyremapper.TinyUtils;
33+
import net.lingala.zip4j.ZipFile;
34+
import net.lingala.zip4j.model.FileHeader;
35+
2336
public class TaskReobfuscate extends Task {
2437
private final Map<String, String> recompHashes = new HashMap<>();
2538
private final Map<String, String> originalHashes = new HashMap<>();
@@ -52,7 +65,7 @@ public void doTask() throws Exception {
5265
md5Task.updateMD5(true);
5366

5467
if (Files.exists(reobfBin)) {
55-
Util.deleteDirectoryIfExists(reobfDir);
68+
FileUtil.deleteDirectoryIfExists(reobfDir);
5669
step();
5770
gatherMD5Hashes(true, this.side);
5871
gatherMD5Hashes(false, this.side);

0 commit comments

Comments
 (0)