forked from KNEMC/KLALB
隧道链接改成标准URI格式
This commit is contained in:
@@ -1,23 +1,22 @@
|
||||
package org.kne.cloud.network.minecraft;
|
||||
|
||||
import java.io.IOException;
|
||||
import java.net.UnknownHostException;
|
||||
import java.util.function.BiConsumer;
|
||||
|
||||
import org.kne.cloud.network.MultipurposeSocketAddress;
|
||||
import org.kne.cloud.network.MultiProtocolSocketAddress;
|
||||
import org.kne.cloud.network.scanner.InetAddressRange;
|
||||
import org.kne.cloud.network.scanner.PortRange;
|
||||
import org.kne.cloud.network.scanner.ScanRange;
|
||||
import org.kne.cloud.network.scanner.TCPNetworkScanner;
|
||||
|
||||
public class MinecraftScanner extends TCPNetworkScanner{
|
||||
private BiConsumer<MultipurposeSocketAddress, MinecraftServerPinger>minecraftConsumer;
|
||||
private BiConsumer<MultiProtocolSocketAddress, MinecraftServerPinger>minecraftConsumer;
|
||||
|
||||
public BiConsumer<MultipurposeSocketAddress, MinecraftServerPinger> getMinecraftConsumer() {
|
||||
public BiConsumer<MultiProtocolSocketAddress, MinecraftServerPinger> getMinecraftConsumer() {
|
||||
return minecraftConsumer;
|
||||
}
|
||||
|
||||
public void setMinecraftConsumer(BiConsumer<MultipurposeSocketAddress, MinecraftServerPinger> minecraftConsumer) {
|
||||
public void setMinecraftConsumer(BiConsumer<MultiProtocolSocketAddress, MinecraftServerPinger> minecraftConsumer) {
|
||||
this.minecraftConsumer = minecraftConsumer;
|
||||
}
|
||||
{
|
||||
|
||||
@@ -6,9 +6,9 @@ import javax.naming.directory.Attributes;
|
||||
import javax.naming.directory.DirContext;
|
||||
import javax.naming.directory.InitialDirContext;
|
||||
|
||||
import org.kne.cloud.network.MultipurposeSocketAddress;
|
||||
import org.kne.cloud.network.MultiProtocolSocketAddress;
|
||||
|
||||
public class MinecraftServerAddress extends MultipurposeSocketAddress
|
||||
public class MinecraftServerAddress extends MultiProtocolSocketAddress
|
||||
{
|
||||
|
||||
private String originAddr;
|
||||
|
||||
@@ -3,14 +3,8 @@ package org.kne.cloud.network.minecraft;
|
||||
import java.awt.image.BufferedImage;
|
||||
import java.io.ByteArrayInputStream;
|
||||
import java.io.EOFException;
|
||||
import java.io.Externalizable;
|
||||
import java.io.IOException;
|
||||
import java.io.InputStream;
|
||||
import java.io.ObjectInput;
|
||||
import java.io.ObjectOutput;
|
||||
import java.io.OutputStream;
|
||||
import java.io.Serializable;
|
||||
import java.io.StringReader;
|
||||
import java.net.Inet6Address;
|
||||
import java.net.InetAddress;
|
||||
import java.net.Socket;
|
||||
@@ -19,13 +13,11 @@ import java.util.Base64;
|
||||
|
||||
import javax.imageio.ImageIO;
|
||||
|
||||
import org.kne.cloud.network.MultipurposeSocketAddress;
|
||||
import org.kne.cloud.network.MultiProtocolSocketAddress;
|
||||
|
||||
import com.google.gson.JsonElement;
|
||||
import com.google.gson.JsonObject;
|
||||
import com.google.gson.JsonParser;
|
||||
import com.google.gson.stream.JsonReader;
|
||||
import com.google.gson.stream.JsonToken;
|
||||
|
||||
public class MinecraftServerPinger implements Serializable{
|
||||
/**
|
||||
@@ -34,7 +26,7 @@ public class MinecraftServerPinger implements Serializable{
|
||||
private static final long serialVersionUID = 1L;
|
||||
private transient Socket socket;
|
||||
private transient MinecraftProtocolContext mpc=new MinecraftProtocolContext();
|
||||
private MultipurposeSocketAddress targetaddr;
|
||||
private MultiProtocolSocketAddress targetaddr;
|
||||
|
||||
|
||||
|
||||
@@ -53,11 +45,11 @@ public class MinecraftServerPinger implements Serializable{
|
||||
private String icon;
|
||||
private transient BufferedImage image;
|
||||
|
||||
public MinecraftServerPinger(MultipurposeSocketAddress target) throws UnknownHostException, IOException {
|
||||
public MinecraftServerPinger(MultiProtocolSocketAddress target) throws UnknownHostException, IOException {
|
||||
this(target,target.connectSocket());
|
||||
}
|
||||
|
||||
public MinecraftServerPinger(MultipurposeSocketAddress target, Socket Asocket) throws UnknownHostException, IOException{
|
||||
public MinecraftServerPinger(MultiProtocolSocketAddress target, Socket Asocket) throws UnknownHostException, IOException{
|
||||
targetaddr=target;
|
||||
socket=Asocket;
|
||||
socket.setTcpNoDelay(true);
|
||||
@@ -302,7 +294,7 @@ public class MinecraftServerPinger implements Serializable{
|
||||
return json;
|
||||
}
|
||||
|
||||
public MultipurposeSocketAddress getTargetaddr() {
|
||||
public MultiProtocolSocketAddress getTargetaddr() {
|
||||
return targetaddr;
|
||||
}
|
||||
|
||||
|
||||
@@ -2,7 +2,7 @@ package org.kne.cloud.network.minecraft;
|
||||
|
||||
import java.net.UnknownHostException;
|
||||
|
||||
import org.kne.cloud.network.MultipurposeSocketAddress;
|
||||
import org.kne.cloud.network.MultiProtocolSocketAddress;
|
||||
import org.kne.cloud.network.scanner.InetAddressRange;
|
||||
import org.kne.cloud.network.scanner.PortRange;
|
||||
import org.kne.cloud.network.scanner.ScanRange;
|
||||
@@ -13,7 +13,7 @@ public class MinecraftServerScanRange extends ScanRange {
|
||||
super(addressRange, portRange);
|
||||
}
|
||||
|
||||
public MinecraftServerScanRange(MultipurposeSocketAddress begin, MultipurposeSocketAddress end)
|
||||
public MinecraftServerScanRange(MultiProtocolSocketAddress begin, MultiProtocolSocketAddress end)
|
||||
throws UnknownHostException {
|
||||
super(begin, end);
|
||||
}
|
||||
@@ -25,8 +25,8 @@ public class MinecraftServerScanRange extends ScanRange {
|
||||
@Override
|
||||
protected void setMsaString(String range) throws UnknownHostException {
|
||||
String[]sp=range.split("~");
|
||||
MultipurposeSocketAddress begin=MinecraftServerAddress.findAddress (sp[0]);
|
||||
MultipurposeSocketAddress end;
|
||||
MultiProtocolSocketAddress begin=MinecraftServerAddress.findAddress (sp[0]);
|
||||
MultiProtocolSocketAddress end;
|
||||
if(sp.length>1) {
|
||||
end=MinecraftServerAddress.findAddress (sp[1]);
|
||||
}else {
|
||||
|
||||
Reference in New Issue
Block a user