diff options
| author |  2xsaiko | 2020-08-04 20:42:39 +0200 |
|---|---|---|
| committer |  GitHub | 2020-08-04 14:42:39 -0400 |
| commit | 75a3442f9ff38222606a1e24753d4a57da1e8c0a (patch) | |
| tree | 5b0e12fb055d15fcb31b0fd07ae4cf9512e0758e /enigma-server | |
| parent | Revamp About dialog (diff) | |
| download | enigma-75a3442f9ff38222606a1e24753d4a57da1e8c0a.tar.gz enigma-75a3442f9ff38222606a1e24753d4a57da1e8c0a.tar.xz enigma-75a3442f9ff38222606a1e24753d4a57da1e8c0a.zip | |
Configuration stuff (#301)
* Begin writing new config system
* Make config work
* Save window size and position
* Add editor font chooser
* Use *.ini for windows and mac instead of *rc
* Allow for changing language without having to restart the program
* Save selected directory in file dialogs
* Make dialog visible after moving it to the correct position
* Don't change theme on the fly since it's broken
* Remove unused gui parameter
* Use xdg-open to open URLs on Linux since Desktop.browse doesn't work, at least not on my PC
* Fix default proposed highlight color
* Multi font selection dialog thingy
* Remember network options
* Make font selection dialog actually work
* Collapse general actions ("OK", "Cancel", ..) into one translation
* Localize font dialog
* Use enum name when saving colors for consistency with currently selected theme
* Save size of split panes
* Import old config
* Add test & fix some parts of the config serializer
* TranslationChangeListener/TranslationUtil -> LanguageChangeListener/LanguageUtil
Diffstat (limited to 'enigma-server')
| -rw-r--r-- | enigma-server/src/main/java/cuchaz/enigma/network/EnigmaServer.java | 32 |
1 files changed, 7 insertions, 25 deletions
diff --git a/enigma-server/src/main/java/cuchaz/enigma/network/EnigmaServer.java b/enigma-server/src/main/java/cuchaz/enigma/network/EnigmaServer.java index 6027a6bd..75981c3b 100644 --- a/enigma-server/src/main/java/cuchaz/enigma/network/EnigmaServer.java +++ b/enigma-server/src/main/java/cuchaz/enigma/network/EnigmaServer.java | |||
| @@ -1,40 +1,22 @@ | |||
| 1 | package cuchaz.enigma.network; | 1 | package cuchaz.enigma.network; |
| 2 | 2 | ||
| 3 | import cuchaz.enigma.network.packet.KickS2CPacket; | 3 | import java.io.*; |
| 4 | import cuchaz.enigma.network.packet.MessageS2CPacket; | ||
| 5 | import cuchaz.enigma.network.packet.Packet; | ||
| 6 | import cuchaz.enigma.network.packet.PacketRegistry; | ||
| 7 | import cuchaz.enigma.network.packet.RemoveMappingS2CPacket; | ||
| 8 | import cuchaz.enigma.network.packet.RenameS2CPacket; | ||
| 9 | import cuchaz.enigma.network.packet.UserListS2CPacket; | ||
| 10 | import cuchaz.enigma.translation.mapping.EntryMapping; | ||
| 11 | import cuchaz.enigma.translation.mapping.EntryRemapper; | ||
| 12 | import cuchaz.enigma.translation.representation.entry.Entry; | ||
| 13 | |||
| 14 | import java.io.DataInput; | ||
| 15 | import java.io.DataInputStream; | ||
| 16 | import java.io.DataOutput; | ||
| 17 | import java.io.DataOutputStream; | ||
| 18 | import java.io.EOFException; | ||
| 19 | import java.io.IOException; | ||
| 20 | import java.net.ServerSocket; | 4 | import java.net.ServerSocket; |
| 21 | import java.net.Socket; | 5 | import java.net.Socket; |
| 22 | import java.net.SocketException; | 6 | import java.net.SocketException; |
| 23 | import java.util.ArrayList; | 7 | import java.util.*; |
| 24 | import java.util.Collections; | ||
| 25 | import java.util.HashMap; | ||
| 26 | import java.util.HashSet; | ||
| 27 | import java.util.List; | ||
| 28 | import java.util.Map; | ||
| 29 | import java.util.Set; | ||
| 30 | import java.util.concurrent.CopyOnWriteArrayList; | 8 | import java.util.concurrent.CopyOnWriteArrayList; |
| 31 | 9 | ||
| 10 | import cuchaz.enigma.network.packet.*; | ||
| 11 | import cuchaz.enigma.translation.mapping.EntryMapping; | ||
| 12 | import cuchaz.enigma.translation.mapping.EntryRemapper; | ||
| 13 | import cuchaz.enigma.translation.representation.entry.Entry; | ||
| 14 | |||
| 32 | public abstract class EnigmaServer { | 15 | public abstract class EnigmaServer { |
| 33 | 16 | ||
| 34 | // https://discordapp.com/channels/507304429255393322/566418023372816394/700292322918793347 | 17 | // https://discordapp.com/channels/507304429255393322/566418023372816394/700292322918793347 |
| 35 | public static final int DEFAULT_PORT = 34712; | 18 | public static final int DEFAULT_PORT = 34712; |
| 36 | public static final int PROTOCOL_VERSION = 0; | 19 | public static final int PROTOCOL_VERSION = 0; |
| 37 | public static final String OWNER_USERNAME = "Owner"; | ||
| 38 | public static final int CHECKSUM_SIZE = 20; | 20 | public static final int CHECKSUM_SIZE = 20; |
| 39 | public static final int MAX_PASSWORD_LENGTH = 255; // length is written as a byte in the login packet | 21 | public static final int MAX_PASSWORD_LENGTH = 255; // length is written as a byte in the login packet |
| 40 | 22 | ||