Merge loftar latest changes

changelog.txt

@@ -1,3 +1,7 @@
+$size[14]{$u{Update for 27.03.21:}
+  * merged loftar's changes
+  * fixed a Java 9 regression around ByteBuffer -- see https://github.com/apache/felix/pull/114 
+
 $size[14]{$u{Update for 16.03.21:}
   * fixed combat damage display not working
 

src/haven/ACheckBox.java

@@ -0,0 +1,75 @@
+/*
+ *  This file is part of the Haven & Hearth game client.
+ *  Copyright (C) 2009 Fredrik Tolf <[email protected]>, and
+ *                     Björn Johannessen <[email protected]>
+ *
+ *  Redistribution and/or modification of this file is subject to the
+ *  terms of the GNU Lesser General Public License, version 3, as
+ *  published by the Free Software Foundation.
+ *
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  Other parts of this source tree adhere to other copying
+ *  rights. Please see the file `COPYING' in the root directory of the
+ *  source tree for details.
+ *
+ *  A copy the GNU Lesser General Public License is distributed along
+ *  with the source tree of which this file is a part in the file
+ *  `doc/LPGL-3'. If it is missing for any reason, please see the Free
+ *  Software Foundation's website at <http://www.fsf.org/>, or write
+ *  to the Free Software Foundation, Inc., 59 Temple Place, Suite 330,
+ *  Boston, MA 02111-1307 USA
+ */
+
+package haven;
+
+import java.util.function.*;
+
+public abstract class ACheckBox extends Widget {
+    public boolean a = false;
+
+    public ACheckBox() {}
+    public ACheckBox(Coord sz) {super(sz);}
+
+    public Supplier<Boolean> state = () -> this.a;
+    public ACheckBox state(Supplier<Boolean> state) {this.state = state; return(this);}
+    public boolean state() {
+	return(state.get());
+    }
+
+    public Consumer<Boolean> changed = a -> {
+	if(canactivate)
+	    wdgmsg("ch", a ? 1 : 0);
+    };
+    public ACheckBox changed(Consumer<Boolean> changed) {this.changed = changed; return(this);}
+    public void changed(boolean val) {changed.accept(val);}
+
+    public Consumer<Boolean> set = a -> {
+	if(this.a != a) {
+	    this.a = a;
+	    changed(a);
+	}
+    };
+    public ACheckBox set(Consumer<Boolean> set) {this.set = set; return(this);}
+    public void set(boolean a) {set.accept(a);}
+
+    public Runnable click = () -> set(!state());
+    public ACheckBox click(Runnable click) {this.click = click; return(this);}
+    public void click() {click.run();}
+
+    public boolean gkeytype(java.awt.event.KeyEvent ev) {
+	click();
+	return(true);
+    }
+
+    public void uimsg(String msg, Object... args) {
+	if(msg == "ch") {
+	    this.a = ((Integer)args[0]) != 0;
+	} else {
+	    super.uimsg(msg, args);
+	}
+    }
+}

src/haven/AuthClient.java

@@ -30,7 +30,7 @@
 import java.net.*;
 import java.security.MessageDigest;
 
-public class AuthClient {
+public class AuthClient implements Closeable {
     private static final SslHelper ssl;
     private Socket sk;
     private InputStream skin;
@@ -98,15 +98,51 @@ public byte[] getcookie() throws IOException {
 	}
     }
 
-    public byte[] gettoken() throws IOException {
-	Message rpl = cmd("mktoken");
+    public static class TokenInfo {
+	public byte[] id = new byte[] {};
+	public String desc = "";
+
+	public TokenInfo id(byte[] id) {this.id = id; return(this);}
+	public TokenInfo desc(String desc) {this.desc = desc; return(this);}
+
+	public Object[] encode() {
+	    Object[] ret = {};
+	    if(this.id.length > 0)
+		ret = Utils.extend(ret, new Object[] {new Object[] {"id", this.id}});
+	    if(this.desc.length() > 0)
+		ret = Utils.extend(ret, new Object[] {new Object[] {"desc", this.desc}});
+	    return(ret);
+	}
+
+	public static TokenInfo forhost() {
+	    TokenInfo ret = new TokenInfo();
+	    if((ret.id = Utils.getprefb("token-id", ret.id)).length == 0) {
+		ret.id = new byte[16];
+		new java.security.SecureRandom().nextBytes(ret.id);
+		Utils.setprefb("token-id", ret.id);
+	    }
+	    if((ret.desc = Utils.getpref("token-desc", null)) == null) {
+		try {
+		    ret.desc = InetAddress.getLocalHost().getHostName();
+		} catch(UnknownHostException e) {
+		}
+	    }
+	    return(ret);
+	}
+    }
+
+    public byte[] gettoken(TokenInfo info) throws IOException {
+	Message rpl = cmd("mktoken", info.encode());
 	String stat = rpl.string();
 	if(stat.equals("ok")) {
 	    return(rpl.bytes(32));
 	} else {
 	    throw(new RuntimeException("Unexpected reply `" + stat + "' from auth server"));
 	}
     }
+    public byte[] gettoken() throws IOException {
+	return(gettoken(TokenInfo.forhost()));
+    }
 
     public void close() throws IOException {
 	sk.close();
@@ -129,6 +165,8 @@ private void esendmsg(Object... args) throws IOException {
 		buf.addstring((String)arg);
 	    } else if(arg instanceof byte[]) {
 		buf.addbytes((byte[])arg);
+	    } else if(arg instanceof Object[]) {
+		buf.addlist((Object[])arg);
 	    } else {
 		throw(new RuntimeException("Illegal argument to esendmsg: " + arg.getClass()));
 	    }