Skip to content

Commit 50bb816

Browse files
LassebqLassebq
committed
Fix merge
2 parents c9329d7 + c4c1dda commit 50bb816

13 files changed

Lines changed: 140 additions & 143 deletions

File tree

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ public final void performTask(TaskMode mode, Side side, boolean enableProgressBa
5454
for (Task task : tasks) {
5555
if (side == Side.ANY) {
5656
// TODO also check if client/server exists locally
57-
if (task.side == Side.SERVER && hasServer || task.side != Side.SERVER) {
57+
if (task.side != Side.SERVER || hasServer) {
5858
performedTasks.add(task);
5959
}
6060
} else if (task.side == side || task.side == Side.ANY) {

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

Lines changed: 5 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -9,18 +9,19 @@ public Options() {
99
resetDefaults();
1010
}
1111

12-
private Map<TaskParameter, Object> options = new HashMap<>();
12+
private final Map<TaskParameter, Object> options = new HashMap<>();
1313

1414
public void setDefault(TaskParameter param) {
1515
Object value = null;
1616
switch (param) {
1717
case DEBUG:
18-
value = false;
19-
break;
2018
case SRC_CLEANUP:
19+
case FULL_BUILD:
20+
case RUN_BUILD:
2121
value = false;
2222
break;
2323
case PATCHES:
24+
case OBFUSCATION:
2425
value = true;
2526
break;
2627
case IGNORED_PACKAGES:
@@ -29,30 +30,13 @@ public void setDefault(TaskParameter param) {
2930
case INDENTION_STRING:
3031
value = "\t";
3132
break;
32-
case OBFUSCATION:
33-
value = true;
34-
break;
35-
case FULL_BUILD:
36-
value = false;
37-
break;
38-
case RUN_BUILD:
39-
value = false;
40-
break;
4133
case RUN_ARGS:
4234
value = new String[] {"-Xms1024M", "-Xmx1024M", "-Djava.util.Arrays.useLegacyMergeSort=true"};
4335
break;
44-
case SETUP_VERSION:
45-
value = null;
46-
break;
4736
case SOURCE_VERSION:
48-
value = -1;
49-
break;
5037
case TARGET_VERSION:
5138
value = -1;
5239
break;
53-
case BOOT_CLASS_PATH:
54-
value = null;
55-
break;
5640
default:
5741
break;
5842
}
@@ -71,8 +55,7 @@ public void setParameter(TaskParameter param, Object value) throws IllegalArgume
7155
public Object getParameter(TaskParameter param) {
7256
Object value = options.get(param);
7357
if(value instanceof String[]) {
74-
String valueStr = String.join(", ", (String[])value);
75-
return valueStr;
58+
return String.join(", ", (String[])value);
7659
}
7760
return value;
7861
}

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -19,13 +19,13 @@ public enum TaskParameter {
1919

2020
public final String desc;
2121
public final String name;
22-
public final Class type;
22+
public final Class<?> type;
2323

24-
TaskParameter(String name, Class c) {
24+
TaskParameter(String name, Class<?> c) {
2525
this(name, "No description provided", c);
2626
}
27-
28-
TaskParameter(String name, String desc, Class c) {
27+
28+
TaskParameter(String name, String desc, Class<?> c) {
2929
TaskMode.nameToParamMap.put(name, this);
3030
this.name = name;
3131
this.desc = desc;

‎src/main/java/org/mcphackers/mcp/gui/MenuBar.java‎

Lines changed: 10 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -42,11 +42,7 @@ public MenuBar(MainGUI mainGUI) {
4242
initOptions();
4343
reloadSide();
4444
JMenuItem update = new JMenuItem("Check for updates");
45-
update.addActionListener(a -> {
46-
operateOnThread(() -> {
47-
owner.performTask(TaskMode.UPDATE_MCP, Side.ANY, false, false);
48-
});
49-
});
45+
update.addActionListener(a -> operateOnThread(() -> owner.performTask(TaskMode.UPDATE_MCP, Side.ANY, false, false)));
5046
JMenuItem[] start = new JMenuItem[2];
5147
String[] sides = {"client", "server"};
5248
for(int i = 0; i < 2; i++) {
@@ -60,8 +56,7 @@ public MenuBar(MainGUI mainGUI) {
6056
});
6157
}
6258
JMenuItem changeDir = new JMenuItem("Change working directory");
63-
changeDir.addActionListener(a -> {
64-
operateOnThread(() -> {
59+
changeDir.addActionListener(a -> operateOnThread(() -> {
6560
String value = (String)JOptionPane.showInputDialog(owner.frame, "Enter a path to a directory", "Change working directory", JOptionPane.PLAIN_MESSAGE, null, null, owner.getWorkingDir().toAbsolutePath().toString());
6661
if(value != null) {
6762
Path p = Paths.get(value);
@@ -71,18 +66,16 @@ public MenuBar(MainGUI mainGUI) {
7166
owner.updateButtonState();
7267
}
7368
}
74-
});
75-
});
69+
})
70+
);
7671
mcpMenu.add(start[0]);
7772
mcpMenu.add(start[1]);
7873
mcpMenu.add(update);
7974
mcpMenu.add(changeDir);
8075
final boolean taskMenu = true;
8176
if(taskMenu) {
82-
List<TaskMode> usedTasks = Arrays.asList(new TaskMode[] {
83-
TaskMode.DECOMPILE, TaskMode.RECOMPILE, TaskMode.REOBFUSCATE, TaskMode.CREATE_PATCH, TaskMode.BUILD,
84-
TaskMode.UPDATE_MCP, TaskMode.START, TaskMode.UPDATE_MD5, TaskMode.EXIT, TaskMode.HELP, TaskMode.SETUP
85-
});
77+
List<TaskMode> usedTasks = Arrays.asList(TaskMode.DECOMPILE, TaskMode.RECOMPILE, TaskMode.REOBFUSCATE, TaskMode.CREATE_PATCH, TaskMode.BUILD,
78+
TaskMode.UPDATE_MCP, TaskMode.START, TaskMode.UPDATE_MD5, TaskMode.EXIT, TaskMode.HELP, TaskMode.SETUP);
8679
JMenu runTask = new JMenu("More tasks...");
8780
for(TaskMode task : TaskMode.registeredTasks) {
8881
if(usedTasks.contains(task)) {
@@ -94,6 +87,7 @@ public MenuBar(MainGUI mainGUI) {
9487
owner.performTask(task, side);
9588
});
9689
});
90+
taskItem.addActionListener(a -> operateOnThread(() -> owner.performTask(task, side)));
9791
runTask.add(taskItem);
9892
}
9993
mcpMenu.add(runTask);
@@ -159,9 +153,7 @@ private void initOptions() {
159153
if(param.type == Boolean.class) {
160154
b = new JRadioButtonMenuItem(param.desc);
161155
resetOptions.put(param, b);
162-
b.addActionListener(e -> {
163-
options.setParameter(param, b.isSelected());
164-
});
156+
b.addActionListener(e -> options.setParameter(param, b.isSelected()));
165157
}
166158
else {
167159
b = new JMenuItem(param.desc);
@@ -178,7 +170,7 @@ private void initOptions() {
178170
options.setParameter(param, valueInt);
179171
return;
180172
}
181-
catch (NumberFormatException e) {}
173+
catch (NumberFormatException ignored) {}
182174
catch (IllegalArgumentException e) {
183175
owner.showMessage(param.desc, "Invalid value!", Task.ERROR);
184176
return;
@@ -231,9 +223,7 @@ private void initOptions() {
231223
}
232224
resetDefaults(resetOptions);
233225
JMenuItem reset = new JMenuItem("Reset to defaults");
234-
reset.addActionListener(e -> {
235-
resetDefaults(resetOptions);
236-
});
226+
reset.addActionListener(e -> resetDefaults(resetOptions));
237227
menuOptions.add(reset);
238228
}
239229

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

Lines changed: 16 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -39,8 +39,8 @@ public class MainCLI extends MCP {
3939
private TaskMode mode;
4040
private Side side = Side.ANY;
4141
private TaskMode helpCommand;
42-
private Console console = System.console();
43-
private Options options = new Options();
42+
private final Console console = System.console();
43+
private final Options options = new Options();
4444
private String currentVersion;
4545

4646
private int[] progresses;
@@ -68,9 +68,10 @@ public MainCLI(String[] args) {
6868
boolean startedWithNoParams = false;
6969
boolean exit = false;
7070
String version = null;
71-
if(Files.exists(Paths.get(MCPPaths.VERSION))) {
71+
Path versionPath = Paths.get(MCPPaths.VERSION);
72+
if(Files.exists(versionPath)) {
7273
try {
73-
currentVersion = VersionsParser.setCurrentVersion(this, new String(Files.readAllBytes(Paths.get(MCPPaths.VERSION))));
74+
currentVersion = VersionsParser.setCurrentVersion(this, new String(Files.readAllBytes(versionPath)));
7475
version = new Ansi().a("Current version: ").fgBrightCyan().a(currentVersion).fgDefault().toString();
7576
} catch (Exception e) {
7677
version = new Ansi().fgBrightRed().a("Unable to get current version!").fgDefault().toString();
@@ -92,14 +93,18 @@ public MainCLI(String[] args) {
9293
while (startedWithNoParams && !exit || !startedWithNoParams && executeTimes < 1) {
9394
while (args.length < 1) {
9495
System.out.print(new Ansi().fgBrightCyan().a("> ").fgRgb(255,255,255));
95-
String str = "";
96+
String str = null;
9697
try {
97-
str = console.readLine().trim();
98+
str = console.readLine();
9899
} catch (NoSuchElementException ignored) {
100+
}
101+
if (str == null) {
99102
mode = TaskMode.EXIT;
103+
} else {
104+
str = str.trim();
105+
System.out.print(new Ansi().fgDefault());
106+
args = str.split(" ");
100107
}
101-
System.out.print(new Ansi().fgDefault());
102-
args = str.split(" ");
103108
}
104109
boolean taskMode = setMode(args[0]);
105110
Map<String, Object> parsedArgs = new HashMap<>();
@@ -231,7 +236,7 @@ public Options getOptions() {
231236
@Override
232237
public boolean yesNoInput(String title, String msg) {
233238
log(msg);
234-
return console.readLine().toLowerCase().equals("yes");
239+
return console.readLine().equalsIgnoreCase("yes");
235240
}
236241

237242
@Override
@@ -290,6 +295,7 @@ private static String progressString(int progress, String progressMsg, String pr
290295

291296
@Override
292297
public void setProgress(int side, String progressMessage) {
298+
//TODO logging messages while progress bar is active still breaks;
293299
synchronized (this) {
294300
progressStrings[side] = progressMessage;
295301
System.out.print(new Ansi().cursorUpLine(progresses.length));
@@ -301,6 +307,7 @@ public void setProgress(int side, String progressMessage) {
301307

302308
@Override
303309
public void setProgress(int side, int progress) {
310+
//TODO logging messages while progress bar is active still breaks;
304311
synchronized (this) {
305312
progresses[side] = progress;
306313
System.out.print(new Ansi().cursorUpLine(progresses.length));

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

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -258,7 +258,7 @@ private boolean isButtonActive(JButton button) {
258258
}
259259

260260
private void addListeners() {
261-
decompileButton.addActionListener(event -> { operateOnThread(() -> {
261+
decompileButton.addActionListener(event -> operateOnThread(() -> {
262262
int response = -1;
263263
if(Files.exists(MCPPaths.get(this, MCPPaths.SRC))) {
264264
response = JOptionPane.showConfirmDialog(frame, "Are you sure you want to delete sources and decompile again?", "Confirm Action", JOptionPane.YES_NO_OPTION);
@@ -270,8 +270,7 @@ private void addListeners() {
270270
}
271271
performTask(TaskMode.DECOMPILE, getSide());
272272
}
273-
});
274-
});
273+
}));
275274
recompileButton.addActionListener(event -> operateOnThread(() -> performTask(TaskMode.RECOMPILE, getSide())));
276275
reobfButton.addActionListener(event -> operateOnThread(() -> performTask(TaskMode.REOBFUSCATE, getSide())));
277276
buildButton.addActionListener(event -> operateOnThread(() -> performTask(TaskMode.BUILD, getSide())));
@@ -290,7 +289,7 @@ public void reloadVersionList() {
290289
else {
291290
currentVersion = null;
292291
}
293-
this.verList = new JComboBox<String>(VersionsParser.getVersionList().toArray(new String[0]));
292+
this.verList = new JComboBox<>(VersionsParser.getVersionList().toArray(new String[0]));
294293
this.verList.addPopupMenuListener(new PopupMenuListener() {
295294

296295
@Override

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

Lines changed: 11 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22

33
import java.io.ByteArrayOutputStream;
44
import java.io.IOException;
5+
import java.nio.file.FileSystem;
56
import java.nio.file.FileSystems;
67
import java.nio.file.Files;
78
import java.nio.file.Path;
@@ -76,14 +77,16 @@ public void doTask() throws Exception {
7677
case REMAP:
7778
if (Files.exists(mappings)) {
7879
MappingUtil.readMappings(mappings, mappingTree);
79-
MappingUtil.modifyClasses(mappingTree, FileSystems.newFileSystem(originalJar, null).getPath("/"), className -> {
80-
if (mappingTree.getClass(className) == null) {
81-
if(className.lastIndexOf("/") < 0) {
82-
return "net/minecraft/src/" + className;
80+
try (FileSystem fs = FileSystems.newFileSystem(originalJar, null)) {
81+
MappingUtil.modifyClasses(mappingTree, fs.getPath("/"), className -> {
82+
if (mappingTree.getClass(className) == null) {
83+
if(className.lastIndexOf("/") < 0) {
84+
return "net/minecraft/src/" + className;
85+
}
8386
}
84-
}
85-
return null;
86-
});
87+
return null;
88+
});
89+
}
8790
MappingUtil.writeMappings(deobfMappings, mappingTree);
8891
MappingUtil.remap(deobfMappings, originalJar, tinyOut, getLibraryPaths(mcp, side), "official", "named");
8992
}
@@ -114,7 +117,7 @@ public void doTask() throws Exception {
114117
case CONSTS:
115118
List<Constants> constants = new ArrayList<>();
116119
if(hasLWJGL)
117-
constants.add(new GLConstants());
120+
constants.add(new GLConstants());
118121
constants.add(new MathConstants());
119122
Constants.replace(ffOut, constants);
120123
break;

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

Lines changed: 9 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -54,22 +54,27 @@ public void doTask() throws Exception {
5454

5555
// Compile side
5656
if (Files.exists(srcPath)) {
57-
List<File> src = Files.walk(srcPath).filter(path -> !Files.isDirectory(path) && path.getFileName().toString().endsWith(".java")).map(Path::toFile).collect(Collectors.toList());
58-
List<File> start = Files.walk(MCPPaths.get(mcp, MCPPaths.CONF + "start")).filter(path -> !Files.isDirectory(path) && path.getFileName().toString().endsWith(".java")).map(Path::toFile).collect(Collectors.toList());
57+
List<File> src;
58+
try(Stream<Path> pathStream = Files.walk(srcPath)) {
59+
src = pathStream.filter(path -> !Files.isDirectory(path) && path.getFileName().toString().endsWith(".java")).map(Path::toFile).collect(Collectors.toList());
60+
}
61+
List<File> start;
62+
try(Stream<Path> pathStream = Files.walk(MCPPaths.get(mcp, MCPPaths.CONF + "start"))) {
63+
start = pathStream.filter(path -> !Files.isDirectory(path) && path.getFileName().toString().endsWith(".java")).map(Path::toFile).collect(Collectors.toList());
64+
}
5965
if(side == Side.CLIENT) {
6066
src.addAll(start);
6167
}
6268

6369
List<String> libraries = new ArrayList<>();
64-
List<String> options = new ArrayList<>();
6570

6671
if(side == Side.SERVER) {
6772
libraries.add(MCPPaths.SERVER);
6873
}
6974
try(Stream<Path> stream = Files.list(libPath).filter(library -> !library.endsWith(".jar")).filter(library -> !Files.isDirectory(library))) {
7075
libraries.addAll(stream.map(Path::toAbsolutePath).map(Path::toString).collect(Collectors.toList()));
7176
}
72-
options.addAll(Arrays.asList("-d", binPath.toString()));
77+
List<String> options = new ArrayList<>(Arrays.asList("-d", binPath.toString()));
7378

7479
int sourceVersion = mcp.getOptions().getIntParameter(TaskParameter.SOURCE_VERSION);
7580
if (sourceVersion >= 0) {

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

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -102,8 +102,7 @@ else if (side == Side.CLIENT) {
102102
side == Side.SERVER ? (VersionsParser.getServerVersion(currentVersion).startsWith("c") ? "com.mojang.minecraft.server.MinecraftServer" : "net.minecraft.server.MinecraftServer")
103103
: runBuild ? "net.minecraft.client.Minecraft" : "Start"));
104104
String[] runArgs = mcp.getOptions().getStringArrayParameter(TaskParameter.RUN_ARGS);
105-
for(int i = 0; i < runArgs.length; i++) {
106-
String arg = runArgs[i];
105+
for (String arg : runArgs) {
107106
args.add(1, arg);
108107
}
109108
int exit = Util.runCommand(args.toArray(new String[0]), MCPPaths.get(mcp, MCPPaths.JARS), true);

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

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@
1010
import java.nio.file.attribute.BasicFileAttributes;
1111
import java.security.NoSuchAlgorithmException;
1212

13+
import java.util.stream.Stream;
1314
import org.mcphackers.mcp.MCP;
1415
import org.mcphackers.mcp.MCPPaths;
1516
import org.mcphackers.mcp.ProgressListener;
@@ -48,10 +49,12 @@ public void updateMD5(boolean reobf) throws Exception {
4849
if (Files.exists(binPath)) {
4950
BufferedWriter writer = new BufferedWriter(new FileWriter(md5.toFile()));
5051
progress = 0;
51-
int total = (int)Files.walk(binPath)
52-
.parallel()
53-
.filter(p -> !p.toFile().isDirectory())
54-
.count();
52+
int total;
53+
try(Stream<Path> pathStream = Files.walk(binPath)) {
54+
total = (int) pathStream.parallel()
55+
.filter(p -> !p.toFile().isDirectory())
56+
.count();
57+
}
5558
Files.walkFileTree(binPath, new SimpleFileVisitor<Path>() {
5659
@Override
5760
public FileVisitResult visitFile(Path file, BasicFileAttributes attrs) throws IOException {

0 commit comments

Comments
 (0)