AstralTransRocketries/minosoft
1
0
Fork 0
mirror of https://gitlab.bixilon.de/bixilon/minosoft.git synced 2025-09-09 07:20:04 -04:00
Code Issues Packages Projects Releases Wiki Activity

print server brand, function in Protocol::getName

Browse Source
This commit is contained in:
bixilon 2020-06-05 03:38:04 +02:00
parent 1702c8ac14
commit d98c6f511e
No known key found for this signature in database
GPG Key ID: 5CAD791931B09AC4
5 changed files with 30 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/main/java/de/bixilon/minosoft/protocol/packets/clientbound/play/PacketPluginMessageReceived.java
View File

@ -31,4 +31,12 @@ public class PacketPluginMessageReceived implements ClientboundPacket {
public void handle(PacketHandler h) {
h.handle(this);
}
public String getChannel() {
return channel;
}
public byte[] getData() {
return data;
}
}

9
src/main/java/de/bixilon/minosoft/protocol/protocol/PacketHandler.java
View File

@ -10,6 +10,7 @@ import de.bixilon.minosoft.protocol.packets.clientbound.status.PacketStatusPong;
import de.bixilon.minosoft.protocol.packets.clientbound.status.PacketStatusResponse;
import de.bixilon.minosoft.protocol.packets.serverbound.login.PacketEncryptionResponse;
import de.bixilon.minosoft.protocol.packets.serverbound.play.PacketKeepAliveResponse;
import de.bixilon.minosoft.protocol.packets.serverbound.play.PacketPluginMessageSended;
import javax.crypto.SecretKey;
import java.math.BigInteger;
@ -78,6 +79,14 @@ public class PacketHandler {
}
public void handle(PacketPluginMessageReceived pkg) {
if (pkg.getChannel().equals("MC|Brand")) {
// server brand received
Log.info(String.format("Server is running %s on version %s", new String(pkg.getData()), connection.getVersion().getName()));
// send back own brand
// ToDo option to toggle for minosoft or original minecraft
connection.sendPacket(new PacketPluginMessageSended("MC|Brand", "Minosoft".getBytes()));
}
}
public void handle(PacketSpawnLocation pkg) {

2
src/main/java/de/bixilon/minosoft/protocol/protocol/Protocol.java
View File

@ -17,6 +17,8 @@ public interface Protocol {
int getPacketCommand(Packets.Serverbound p);
String getName();
Packets.Clientbound getPacketByCommand(ConnectionState s, int command);
static Class<? extends ClientboundPacket> getPacketByPacket(Packets.Clientbound p) {

8
src/main/java/de/bixilon/minosoft/protocol/protocol/ProtocolVersion.java
View File

@ -3,8 +3,8 @@ package de.bixilon.minosoft.protocol.protocol;
public enum ProtocolVersion {
VERSION_1_7_10(new Protocol_1_7_10());
private int version;
private Protocol protocol;
private final int version;
private final Protocol protocol;
ProtocolVersion(Protocol protocol) {
this.protocol = protocol;
@ -23,4 +23,8 @@ public enum ProtocolVersion {
return protocol.getPacketCommand(p);
}
public String getName() {
return protocol.getName();
}
}

5
src/main/java/de/bixilon/minosoft/protocol/protocol/Protocol_1_7_10.java
View File

@ -128,6 +128,11 @@ public class Protocol_1_7_10 implements Protocol {
return serverboundPacketMapping.get(p);
}
@Override
public String getName() {
return "1.7.10";
}
public Packets.Clientbound getPacketByCommand(ConnectionState s, int command) {
for (Map.Entry<Packets.Clientbound, Integer> set : clientboundPacketMapping.entrySet()) {
if (set.getValue() == command && set.getKey().name().startsWith(s.name())) {