R3944Realms/Ambassador
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

zeta compatibility fixed

Browse Source
This commit is contained in:
Adrian Bergqvist 2024-02-13 01:59:51 +01:00
parent b91d767163
commit 45e41a5b83
No known key found for this signature in database
GPG Key ID: 3B3DA43224B79417
5 changed files with 18 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/main/java/org/adde0109/ambassador/forge/ForgeHandshake.java
View File

@ -1,5 +1,7 @@
package org.adde0109.ambassador.forge;
import org.adde0109.ambassador.forge.packet.Context;
import org.adde0109.ambassador.forge.packet.GenericForgeLoginWrapperPacket;
import org.adde0109.ambassador.forge.packet.ModListReplyPacket;
import org.adde0109.ambassador.forge.packet.RegistryPacket;
@ -11,6 +13,7 @@ import java.util.zip.Checksum;
public class ForgeHandshake {
private ModListReplyPacket modListReplyPacket;
private final Map<String, Long> registries = new HashMap<>();
public GenericForgeLoginWrapperPacket<Context.ClientContext> zetaFlagsPacket;
public ForgeHandshake() {
}

8
src/main/java/org/adde0109/ambassador/forge/ForgeHandshakeUtils.java
View File

@ -122,17 +122,17 @@ public class ForgeHandshakeUtils {
static enum ThirdPartyChannel {
SILENTGEAR_NETWORK {
@Override
public ThirdPartyRegistryUtils.ACKPacket generateResponsePacket(Context.ClientContext context) {
public IForgeLoginWrapperPacket<Context.ClientContext> generateResponsePacket(Context.ClientContext context, ForgeHandshake completed) {
return new ACKPacket(context, 3);
}
},
ZETA_MAIN {
@Override
public ThirdPartyRegistryUtils.ACKPacket generateResponsePacket(Context.ClientContext context) {
return new ACKPacket(context, 99);
public IForgeLoginWrapperPacket<Context.ClientContext> generateResponsePacket(Context.ClientContext context, ForgeHandshake completed) {
return new GenericForgeLoginWrapperPacket<Context.ClientContext>(completed.zetaFlagsPacket.getContent(), context);
}
};
abstract public ACKPacket generateResponsePacket(Context.ClientContext context);
abstract public IForgeLoginWrapperPacket<Context.ClientContext> generateResponsePacket(Context.ClientContext context, ForgeHandshake completed);
}
static boolean isThirdPartyPacket(GenericForgeLoginWrapperPacket<Context> packet) {

6
src/main/java/org/adde0109/ambassador/forge/VelocityForgeBackendConnectionPhase.java
View File

@ -139,7 +139,11 @@ public enum VelocityForgeBackendConnectionPhase implements BackendConnectionPhas
server.getConnection().write(new ACKPacket(Context.fromContext(message.getContext(), true)));
} else if (message instanceof GenericForgeLoginWrapperPacket<Context> packet
&& ForgeHandshakeUtils.ThirdPartyRegistryUtils.isThirdPartyPacket(packet)) {
server.getConnection().write(ForgeHandshakeUtils.ThirdPartyRegistryUtils.getThirdPartyChannel(packet));
server.getConnection().write(
ForgeHandshakeUtils.ThirdPartyRegistryUtils.getThirdPartyChannel(packet).
generateResponsePacket(
Context.ClientContext.fromContext(packet.getContext(), true),
clientPhase.forgeHandshake));
}
}
//Forge server

5
src/main/java/org/adde0109/ambassador/forge/VelocityForgeClientConnectionPhase.java
View File

@ -17,6 +17,7 @@ import io.netty.buffer.Unpooled;
import net.kyori.adventure.text.Component;
import org.adde0109.ambassador.Ambassador;
import org.adde0109.ambassador.forge.packet.Context;
import org.adde0109.ambassador.forge.packet.GenericForgeLoginWrapperPacket;
import org.adde0109.ambassador.forge.packet.IForgeLoginWrapperPacket;
import org.adde0109.ambassador.forge.packet.ModListReplyPacket;
import org.adde0109.ambassador.velocity.client.FML2CRPMResetCompleteDecoder;
@ -129,6 +130,10 @@ public enum VelocityForgeClientConnectionPhase implements ClientConnectionPhase
public boolean handle(ConnectedPlayer player, IForgeLoginWrapperPacket<Context.ClientContext> msg, VelocityServerConnection server) {
if (msg.getContext().getChannelName().equals("zeta:main")) {
forgeHandshake.zetaFlagsPacket = (GenericForgeLoginWrapperPacket<Context.ClientContext>) msg;
}
if (msg instanceof ModListReplyPacket replyPacket) {
ModInfo modInfo = new ModInfo("FML2", replyPacket.getMods().stream().map(
(v) -> new ModInfo.Mod(v,"1")).toList());

2
src/main/java/org/adde0109/ambassador/forge/packet/GenericForgeLoginWrapperPacket.java
View File

@ -8,7 +8,7 @@ public class GenericForgeLoginWrapperPacket<T extends Context> implements IForge
private final byte[] content;
private final T context;
GenericForgeLoginWrapperPacket(byte[] content, T context) {
public GenericForgeLoginWrapperPacket(byte[] content, T context) {
this.content = content;
this.context = context;
}