alterwain/XCraftAuth
alterwain/XCraftAuth
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Bungeecord support added x11

Browse Source
This commit is contained in:
Michael Wain 2025-03-21 23:21:53 +03:00
parent 919d645ba0
commit 52e7bea49c
2 changed files with 18 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
bungee/src/main/java/com/alterdekim/xcraft/auth/bungee/EncryptionResponsePacket.java
View File

@ -1,6 +1,7 @@
package com.alterdekim.xcraft.auth.bungee; package com.alterdekim.xcraft.auth.bungee;
import com.google.common.base.Preconditions; import com.google.common.base.Preconditions;
import io.netty.buffer.ByteBuf;
import net.md_5.bungee.BungeeCord; import net.md_5.bungee.BungeeCord;
import net.md_5.bungee.EncryptionUtil; import net.md_5.bungee.EncryptionUtil;
import net.md_5.bungee.Util; import net.md_5.bungee.Util;
@ -13,6 +14,7 @@ import net.md_5.bungee.netty.ChannelWrapper;
import net.md_5.bungee.netty.cipher.CipherDecoder; import net.md_5.bungee.netty.cipher.CipherDecoder;
import net.md_5.bungee.netty.cipher.CipherEncoder; import net.md_5.bungee.netty.cipher.CipherEncoder;
import net.md_5.bungee.protocol.AbstractPacketHandler; import net.md_5.bungee.protocol.AbstractPacketHandler;
import net.md_5.bungee.protocol.ProtocolConstants;
import net.md_5.bungee.protocol.packet.EncryptionRequest; import net.md_5.bungee.protocol.packet.EncryptionRequest;
import net.md_5.bungee.protocol.packet.EncryptionResponse; import net.md_5.bungee.protocol.packet.EncryptionResponse;
@ -24,14 +26,25 @@ import java.security.MessageDigest;
import java.util.logging.Level; import java.util.logging.Level;
import java.util.logging.Logger; import java.util.logging.Logger;
import static net.md_5.bungee.BungeeCord.getInstance;
import static com.alterdekim.xcraft.auth.bungee.XCraft.INTERNAL_PORT; import static com.alterdekim.xcraft.auth.bungee.XCraft.INTERNAL_PORT;
public class EncryptionResponsePacket extends EncryptionResponse { public class EncryptionResponsePacket extends EncryptionResponse {
@Override
public void read(ByteBuf buf, ProtocolConstants.Direction direction, int protocolVersion) {
super.read(buf, direction, protocolVersion);
}
@Override
public void write(ByteBuf buf, ProtocolConstants.Direction direction, int protocolVersion) {
super.write(buf, direction, protocolVersion);
}
@Override @Override
public void handle(AbstractPacketHandler handler) throws Exception { public void handle(AbstractPacketHandler handler) throws Exception {
//this.logger.info("Intercepted handle request, returning custom response..."); getInstance().getLogger().info("Intercepted handle request, returning custom response...");
InitialHandler initialHandler = (InitialHandler) handler; InitialHandler initialHandler = (InitialHandler) handler;
Class<?> initialHandlerClass = InitialHandler.class; Class<?> initialHandlerClass = InitialHandler.class;
Method finish = initialHandlerClass.getDeclaredMethod("finish"); Method finish = initialHandlerClass.getDeclaredMethod("finish");
@ -82,13 +95,13 @@ public class EncryptionResponsePacket extends EncryptionResponse {
finish.invoke(initialHandler); finish.invoke(initialHandler);
return; return;
} catch (Exception e) { } catch (Exception e) {
//EncryptionResponsePacket.this.logger.log(Level.SEVERE, "Error authenticating " + initialHandler.getName() + " with XCraftAuth", e); getInstance().getLogger().log(Level.SEVERE, "Error authenticating " + initialHandler.getName() + " with XCraftAuth", e);
} }
} }
initialHandler.disconnect("You're in offline mode"); initialHandler.disconnect("You're in offline mode");
} else { } else {
initialHandler.disconnect("XCraftAuth has failed to authenticate you"); initialHandler.disconnect("XCraftAuth has failed to authenticate you");
//EncryptionResponsePacket.this.logger.log(Level.SEVERE, "Error authenticating " + initialHandler.getName() + " with XCraftAuth", error); getInstance().getLogger().log(Level.SEVERE, "Error authenticating " + initialHandler.getName() + " with XCraftAuth", error);
} }
} }
}; };

4
bungee/src/main/java/com/alterdekim/xcraft/auth/bungee/XCraft.java
View File

@ -93,8 +93,8 @@ public class XCraft extends Plugin {
Constructor<? extends DefinedPacket>[] packetConstructors = (Constructor<? extends DefinedPacket>[]) packetConstructorsField.get(protocolData); Constructor<? extends DefinedPacket>[] packetConstructors = (Constructor<? extends DefinedPacket>[]) packetConstructorsField.get(protocolData);
packetMap.remove(EncryptionResponse.class); packetMap.remove(EncryptionResponse.class);
packetMap.put( EncryptionResponsePacket.class, 0x01); packetMap.put( EncryptionResponsePacket.class, 1);
packetConstructors[0x01] = EncryptionResponsePacket.class.getDeclaredConstructor(); packetConstructors[1] = EncryptionResponsePacket.class.getDeclaredConstructor();
packetMapField.set(protocolData, packetMap); packetMapField.set(protocolData, packetMap);
packetConstructorsField.set(protocolData, packetConstructors); packetConstructorsField.set(protocolData, packetConstructors);