Add 1.14.1 and 1.14.2 + cleaner error messages for network API
This commit is contained in:
parent
8a56e6a50e
commit
71fefda597
@ -27,7 +27,9 @@ public enum MinecraftVersion {
|
||||
v1_13(393, "1.13"),
|
||||
v1_13_1(401, "1.13.1"),
|
||||
v1_13_2(404, "1.13.2"),
|
||||
v1_14(477, "1.14");
|
||||
v1_14(477, "1.14"),
|
||||
v1_14_1(480, "1.14.1"),
|
||||
v1_14_2(485, "1.14.2");
|
||||
// IMPORTANT: don't forget to update the versionMergeDisplay value when adding a new version;
|
||||
|
||||
private static Map<EnumSet<MinecraftVersion>, List<String>> versionMergeDisplay;
|
||||
@ -67,6 +69,13 @@ public enum MinecraftVersion {
|
||||
ImmutableList.of("1.13", "1.13.1"));
|
||||
versionMergeDisplay.put(EnumSet.of(v1_13_1, v1_13_2),
|
||||
ImmutableList.of("1.13.1", "1.13.2"));
|
||||
|
||||
versionMergeDisplay.put(EnumSet.of(v1_14, v1_14_1, v1_14_2),
|
||||
ImmutableList.of("1.14.x"));
|
||||
versionMergeDisplay.put(EnumSet.of(v1_14, v1_14_1),
|
||||
ImmutableList.of("1.14", "1.14.1"));
|
||||
versionMergeDisplay.put(EnumSet.of(v1_14_1, v1_14_2),
|
||||
ImmutableList.of("1.14.1", "1.14.2"));
|
||||
|
||||
|
||||
}
|
||||
|
@ -5,6 +5,7 @@ import java.io.PrintStream;
|
||||
import java.net.Socket;
|
||||
|
||||
import fr.pandacube.java.util.Log;
|
||||
import fr.pandacube.java.util.network_api.server.RequestAnalyser.BadRequestException;
|
||||
|
||||
/**
|
||||
* Prends en charge un socket client et le transmet au gestionnaire de paquet
|
||||
@ -43,7 +44,15 @@ public class PacketExecutor implements Runnable {
|
||||
rep.sendPacket(new PrintStream(socket.getOutputStream()));
|
||||
} catch (IOException e1) {}
|
||||
if (e instanceof IOException)
|
||||
Log.warning("Impossible de lire le packet reçu sur le socket " + socket + " : " + e.toString());
|
||||
Log.warning("Unable to read packet from socket " + socket + ": " + e.toString());
|
||||
else if(e instanceof BadRequestException) {
|
||||
if (e.getMessage().equals("wrong_password"))
|
||||
Log.warning("Wrong password received from socket " + socket);
|
||||
else if (e.getMessage().equals("command_not_exists"))
|
||||
Log.severe("The command requested from the socket " + socket + " does not exist");
|
||||
else
|
||||
Log.severe(e);
|
||||
}
|
||||
else
|
||||
Log.severe(e);
|
||||
}
|
||||
|
Loading…
Reference in New Issue
Block a user