From 75a3442f9ff38222606a1e24753d4a57da1e8c0a Mon Sep 17 00:00:00 2001
From: 2xsaiko
Date: Tue, 4 Aug 2020 20:42:39 +0200
Subject: 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---
 .../java/cuchaz/enigma/network/EnigmaServer.java   | 32 +++++-----------------
 1 file changed, 7 insertions(+), 25 deletions(-)

(limited to 'enigma-server')

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 @@
 package cuchaz.enigma.network;
 
-import cuchaz.enigma.network.packet.KickS2CPacket;
-import cuchaz.enigma.network.packet.MessageS2CPacket;
-import cuchaz.enigma.network.packet.Packet;
-import cuchaz.enigma.network.packet.PacketRegistry;
-import cuchaz.enigma.network.packet.RemoveMappingS2CPacket;
-import cuchaz.enigma.network.packet.RenameS2CPacket;
-import cuchaz.enigma.network.packet.UserListS2CPacket;
-import cuchaz.enigma.translation.mapping.EntryMapping;
-import cuchaz.enigma.translation.mapping.EntryRemapper;
-import cuchaz.enigma.translation.representation.entry.Entry;
-
-import java.io.DataInput;
-import java.io.DataInputStream;
-import java.io.DataOutput;
-import java.io.DataOutputStream;
-import java.io.EOFException;
-import java.io.IOException;
+import java.io.*;
 import java.net.ServerSocket;
 import java.net.Socket;
 import java.net.SocketException;
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
+import java.util.*;
 import java.util.concurrent.CopyOnWriteArrayList;
 
+import cuchaz.enigma.network.packet.*;
+import cuchaz.enigma.translation.mapping.EntryMapping;
+import cuchaz.enigma.translation.mapping.EntryRemapper;
+import cuchaz.enigma.translation.representation.entry.Entry;
+
 public abstract class EnigmaServer {
 
 	// https://discordapp.com/channels/507304429255393322/566418023372816394/700292322918793347
 	public static final int DEFAULT_PORT = 34712;
 	public static final int PROTOCOL_VERSION = 0;
-	public static final String OWNER_USERNAME = "Owner";
 	public static final int CHECKSUM_SIZE = 20;
 	public static final int MAX_PASSWORD_LENGTH = 255; // length is written as a byte in the login packet
 
-- 
cgit v1.2.3