Sneederix/sneedmc
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Improve mpticket file parsing code

Browse Source
This commit is contained in:
icelimetea 2022-05-05 07:14:32 +01:00
parent 9a87ae575e
commit dcc41ef885
1 changed files with 16 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
libraries/launcher/org/multimc/applet/LegacyFrame.java
View File

@ -28,7 +28,7 @@ import java.nio.file.Files;
import java.nio.file.Path; import java.nio.file.Path;
import java.nio.file.Paths; import java.nio.file.Paths;
import java.nio.file.StandardCopyOption; import java.nio.file.StandardCopyOption;
import java.util.Scanner; import java.util.List;
import java.util.logging.Level; import java.util.logging.Level;
import java.util.logging.Logger; import java.util.logging.Logger;
@ -51,7 +51,7 @@ public final class LegacyFrame extends Frame {
LOGGER.log(Level.WARNING, "Unable to read Minecraft icon!", e); LOGGER.log(Level.WARNING, "Unable to read Minecraft icon!", e);
} }
this.addWindowListener(new ForceExitHandler()); addWindowListener(new ForceExitHandler());
} }
public void start ( public void start (
@ -73,34 +73,24 @@ public final class LegacyFrame extends Frame {
Paths.get(System.getProperty("user.dir"), "..", "mpticket.corrupt"); Paths.get(System.getProperty("user.dir"), "..", "mpticket.corrupt");
if (Files.exists(mpticketFile)) { if (Files.exists(mpticketFile)) {
try (Scanner fileScanner = new Scanner( try {
Files.newInputStream(mpticketFile), List<String> lines = Files.readAllLines(mpticketFile, StandardCharsets.UTF_8);
StandardCharsets.US_ASCII.name()
)) {
String[] mpticketParams = new String[3];
for (int i = 0; i < mpticketParams.length; i++) { if (lines.size() != 3) {
if (fileScanner.hasNextLine()) { Files.move(
mpticketParams[i] = fileScanner.nextLine(); mpticketFile,
} else { mpticketFileCorrupt,
Files.move( StandardCopyOption.REPLACE_EXISTING
mpticketFile, );
mpticketFileCorrupt,
StandardCopyOption.REPLACE_EXISTING
);
throw new IllegalArgumentException("Mpticket file is corrupted!"); LOGGER.warning("Mpticket file is corrupted!");
} } else {
appletWrap.setParameter("server", lines.get(0));
appletWrap.setParameter("port", lines.get(1));
appletWrap.setParameter("mppass", lines.get(2));
} }
Files.delete(mpticketFile);
// Assumes parameters are valid and in the correct order
appletWrap.setParameter("server", mpticketParams[0]);
appletWrap.setParameter("port", mpticketParams[1]);
appletWrap.setParameter("mppass", mpticketParams[2]);
} catch (IOException e) { } catch (IOException e) {
LOGGER.log(Level.WARNING, "Unable to read mpticket file!", e); LOGGER.log(Level.WARNING, "Unable to red mpticket file!", e);
} }
} }