Reuse jchess-uci-client

pom.xml

@@ -30,6 +30,11 @@
 			<artifactId>jchess-uci</artifactId>
 			<version>2.0.3-SNAPSHOT</version>
 		</dependency>
+		<dependency>
+			<groupId>com.fathzer</groupId>
+			<artifactId>jchess-uci-client</artifactId>
+			<version>0.0.1-SNAPSHOT</version>
+		</dependency>
 		<dependency>
 			<groupId>com.fathzer</groupId>
 			<artifactId>plugin-loader</artifactId>

src/main/java/com/fathzer/jchess/bot/Engine.java

@@ -6,6 +6,7 @@
 
 import com.fathzer.games.clock.CountDownState;
 import com.fathzer.jchess.settings.Settings.Variant;
+import com.fathzer.uci.client.Option;
 
 public interface Engine extends Closeable {
 	String getName();

src/main/java/com/fathzer/jchess/bot/uci/EngineLoader.java

@@ -9,15 +9,16 @@
 import java.util.HashSet;
 import java.util.List;
 import java.util.Map;
+import java.util.Map.Entry;
 import java.util.Optional;
 import java.util.Set;
 
 import org.json.JSONException;
 import org.json.JSONObject;
 
 import com.fathzer.jchess.bot.Engine;
-import com.fathzer.jchess.bot.Option;
 import com.fathzer.jchess.internal.InternalEngine;
+import com.fathzer.uci.client.Option;
 import com.fathzer.util.TinyJackson;
 import com.fathzer.util.TinyJackson.JsonIgnore;
 import com.fathzer.util.TinyJackson.JsonOptional;
@@ -143,14 +144,7 @@ public boolean start() throws IOException {
 				if (command!=null) {
 					engine = new UCIEngine(this);
 					if (options!=null) {
-						for (String optionName : options.keySet()) {
-							final Optional<Option<?>> option = engine.getOptions().stream().filter(o -> o.getName().equals(optionName)).findAny();
-							if (option.isEmpty()) {
-								throw new IOException("Engine "+name+" has no "+optionName+" option");
-							}
-							final Option<?> theOption = option.get();
-							setValue(theOption, options.get(optionName));
-						}
+						applyOptions();
 					}
 				} else {
 					engine = new InternalEngine();
@@ -159,6 +153,17 @@ public boolean start() throws IOException {
 			}
 			return false;
 		}
+
+		private void applyOptions() throws IOException {
+			for (Entry<String, String> entry : options.entrySet()) {
+				final Optional<Option<?>> option = engine.getOptions().stream().filter(o -> o.getName().equals(entry.getKey())).findAny();
+				if (option.isEmpty()) {
+					throw new IOException("Engine "+name+" has no "+entry.getKey()+" option");
+				}
+				final Option<?> theOption = option.get();
+				setValue(theOption, entry.getValue());
+			}
+		}
 
 		private <T> void setValue(Option<T> option, String value) {
 			option.setValue(option.toValue(value));