get rid of JavaFX
This commit is contained in:
+1
-1
@@ -10,7 +10,7 @@ import com.github.manevolent.ts3j.protocol.packet.PacketBody8Init1;
|
|||||||
import com.github.manevolent.ts3j.protocol.socket.client.LocalTeamspeakClientSocket;
|
import com.github.manevolent.ts3j.protocol.socket.client.LocalTeamspeakClientSocket;
|
||||||
import com.github.manevolent.ts3j.util.Ts3Crypt;
|
import com.github.manevolent.ts3j.util.Ts3Crypt;
|
||||||
import com.github.manevolent.ts3j.util.Ts3Debugging;
|
import com.github.manevolent.ts3j.util.Ts3Debugging;
|
||||||
import javafx.util.Pair;
|
import com.github.manevolent.ts3j.util.Pair;
|
||||||
import org.bouncycastle.math.ec.ECPoint;
|
import org.bouncycastle.math.ec.ECPoint;
|
||||||
|
|
||||||
import java.io.IOException;
|
import java.io.IOException;
|
||||||
|
|||||||
+1
-1
@@ -2,7 +2,7 @@ package com.github.manevolent.ts3j.protocol.packet.transformation;
|
|||||||
|
|
||||||
|
|
||||||
import com.github.manevolent.ts3j.protocol.header.PacketHeader;
|
import com.github.manevolent.ts3j.protocol.header.PacketHeader;
|
||||||
import javafx.util.Pair;
|
import com.github.manevolent.ts3j.util.Pair;
|
||||||
|
|
||||||
public class InitPacketTransformation extends PacketTransformation {
|
public class InitPacketTransformation extends PacketTransformation {
|
||||||
private static final byte[] key =
|
private static final byte[] key =
|
||||||
|
|||||||
+1
-1
@@ -4,7 +4,7 @@ import com.github.manevolent.ts3j.protocol.Packet;
|
|||||||
import com.github.manevolent.ts3j.protocol.ProtocolRole;
|
import com.github.manevolent.ts3j.protocol.ProtocolRole;
|
||||||
import com.github.manevolent.ts3j.protocol.header.PacketHeader;
|
import com.github.manevolent.ts3j.protocol.header.PacketHeader;
|
||||||
import com.github.manevolent.ts3j.util.Ts3Crypt;
|
import com.github.manevolent.ts3j.util.Ts3Crypt;
|
||||||
import javafx.util.Pair;
|
import com.github.manevolent.ts3j.util.Pair;
|
||||||
import org.bouncycastle.crypto.CipherParameters;
|
import org.bouncycastle.crypto.CipherParameters;
|
||||||
import org.bouncycastle.crypto.InvalidCipherTextException;
|
import org.bouncycastle.crypto.InvalidCipherTextException;
|
||||||
import org.bouncycastle.crypto.engines.AESEngine;
|
import org.bouncycastle.crypto.engines.AESEngine;
|
||||||
|
|||||||
+1
-1
@@ -20,7 +20,7 @@ import com.github.manevolent.ts3j.protocol.socket.AbstractTeamspeakSocket;
|
|||||||
import com.github.manevolent.ts3j.util.QuickLZ;
|
import com.github.manevolent.ts3j.util.QuickLZ;
|
||||||
import com.github.manevolent.ts3j.util.Ts3Crypt;
|
import com.github.manevolent.ts3j.util.Ts3Crypt;
|
||||||
import com.github.manevolent.ts3j.util.Ts3Debugging;
|
import com.github.manevolent.ts3j.util.Ts3Debugging;
|
||||||
import javafx.util.Pair;
|
import com.github.manevolent.ts3j.util.Pair;
|
||||||
import org.bouncycastle.crypto.InvalidCipherTextException;
|
import org.bouncycastle.crypto.InvalidCipherTextException;
|
||||||
|
|
||||||
import java.io.IOException;
|
import java.io.IOException;
|
||||||
|
|||||||
+1
-1
@@ -22,7 +22,7 @@ import com.github.manevolent.ts3j.protocol.packet.PacketBody2Command;
|
|||||||
import com.github.manevolent.ts3j.protocol.packet.statistics.PacketStatistics;
|
import com.github.manevolent.ts3j.protocol.packet.statistics.PacketStatistics;
|
||||||
import com.github.manevolent.ts3j.util.HighPrecisionRecurrentTask;
|
import com.github.manevolent.ts3j.util.HighPrecisionRecurrentTask;
|
||||||
import com.github.manevolent.ts3j.util.Ts3Debugging;
|
import com.github.manevolent.ts3j.util.Ts3Debugging;
|
||||||
import javafx.util.Pair;
|
import com.github.manevolent.ts3j.util.Pair;
|
||||||
|
|
||||||
import java.io.IOException;
|
import java.io.IOException;
|
||||||
import java.net.*;
|
import java.net.*;
|
||||||
|
|||||||
@@ -0,0 +1,100 @@
|
|||||||
|
package com.github.manevolent.ts3j.util;
|
||||||
|
|
||||||
|
import java.io.Serializable;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* <p>A convenience class to represent name-value pairs.</p>
|
||||||
|
*/
|
||||||
|
public class Pair<K,V> implements Serializable {
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Key of this <code>Pair</code>.
|
||||||
|
*/
|
||||||
|
private K key;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Gets the key for this pair.
|
||||||
|
* @return key for this pair
|
||||||
|
*/
|
||||||
|
public K getKey() { return key; }
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Value of this this <code>Pair</code>.
|
||||||
|
*/
|
||||||
|
private V value;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Gets the value for this pair.
|
||||||
|
* @return value for this pair
|
||||||
|
*/
|
||||||
|
public V getValue() { return value; }
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Creates a new pair
|
||||||
|
* @param key The key for this pair
|
||||||
|
* @param value The value to use for this pair
|
||||||
|
*/
|
||||||
|
public Pair(K key, V value) {
|
||||||
|
this.key = key;
|
||||||
|
this.value = value;
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* <p><code>String</code> representation of this
|
||||||
|
* <code>Pair</code>.</p>
|
||||||
|
*
|
||||||
|
* <p>The default name/value delimiter '=' is always used.</p>
|
||||||
|
*
|
||||||
|
* @return <code>String</code> representation of this <code>Pair</code>
|
||||||
|
*/
|
||||||
|
@Override
|
||||||
|
public String toString() {
|
||||||
|
return key + "=" + value;
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* <p>Generate a hash code for this <code>Pair</code>.</p>
|
||||||
|
*
|
||||||
|
* <p>The hash code is calculated using both the name and
|
||||||
|
* the value of the <code>Pair</code>.</p>
|
||||||
|
*
|
||||||
|
* @return hash code for this <code>Pair</code>
|
||||||
|
*/
|
||||||
|
@Override
|
||||||
|
public int hashCode() {
|
||||||
|
// name's hashCode is multiplied by an arbitrary prime number (13)
|
||||||
|
// in order to make sure there is a difference in the hashCode between
|
||||||
|
// these two parameters:
|
||||||
|
// name: a value: aa
|
||||||
|
// name: aa value: a
|
||||||
|
return key.hashCode() * 13 + (value == null ? 0 : value.hashCode());
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* <p>Test this <code>Pair</code> for equality with another
|
||||||
|
* <code>Object</code>.</p>
|
||||||
|
*
|
||||||
|
* <p>If the <code>Object</code> to be tested is not a
|
||||||
|
* <code>Pair</code> or is <code>null</code>, then this method
|
||||||
|
* returns <code>false</code>.</p>
|
||||||
|
*
|
||||||
|
* <p>Two <code>Pair</code>s are considered equal if and only if
|
||||||
|
* both the names and values are equal.</p>
|
||||||
|
*
|
||||||
|
* @param o the <code>Object</code> to test for
|
||||||
|
* equality with this <code>Pair</code>
|
||||||
|
* @return <code>true</code> if the given <code>Object</code> is
|
||||||
|
* equal to this <code>Pair</code> else <code>false</code>
|
||||||
|
*/
|
||||||
|
@Override
|
||||||
|
public boolean equals(Object o) {
|
||||||
|
if (this == o) return true;
|
||||||
|
if (o instanceof Pair) {
|
||||||
|
Pair pair = (Pair) o;
|
||||||
|
if (key != null ? !key.equals(pair.key) : pair.key != null) return false;
|
||||||
|
if (value != null ? !value.equals(pair.value) : pair.value != null) return false;
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -7,7 +7,7 @@ import Punisher.NaCl.Internal.Ed25519Ref10.ScalarOperations;
|
|||||||
import Punisher.NaCl.Internal.Sha512;
|
import Punisher.NaCl.Internal.Sha512;
|
||||||
import com.github.manevolent.ts3j.identity.*;
|
import com.github.manevolent.ts3j.identity.*;
|
||||||
import com.github.manevolent.ts3j.license.License;
|
import com.github.manevolent.ts3j.license.License;
|
||||||
import javafx.util.Pair;
|
import com.github.manevolent.ts3j.util.Pair;
|
||||||
import org.bouncycastle.asn1.*;
|
import org.bouncycastle.asn1.*;
|
||||||
import org.bouncycastle.crypto.digests.SHA256Digest;
|
import org.bouncycastle.crypto.digests.SHA256Digest;
|
||||||
import org.bouncycastle.crypto.params.ECDomainParameters;
|
import org.bouncycastle.crypto.params.ECDomainParameters;
|
||||||
|
|||||||
Reference in New Issue
Block a user